[Mesa-dev] Mesa (master): mesa: replace ctx->Const.{Vertex, Fragment, Geomtery}Program with an array.

[Jose Fonseca]

----- Original Message -----
> Module: Mesa
> Branch: master
> Commit: 84732a982c3eeaca2e2809532c8422dc5f7045c1
> URL:
> https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/mesa/mesa/commit/?id%3D84732a982c3eeaca2e2809532c8422dc5f7045c1&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=NMr9uy2iTjWVixC0wOcYCWEIYhfo80qKwRgdodpoDzA%3D%0A&m=9DwPDHJaDAAyqfsxRgnePXLQ%2BaaGu%2FosJQ%2BFGBXIoPE%3D%0A&s=110fd0cac78061466f428820411e5aa2f2872e8e2ae99323974356f0544b8cfd
> 
> Author: Paul Berry <stereotype441 at gmail.com>
> Date:   Wed Jan  8 10:00:28 2014 -0800
> 
> mesa: replace ctx->Const.{Vertex,Fragment,Geomtery}Program with an array.
> 
> These are replaced with
> ctx->Const.Program[MESA_SHADER_{VERTEX,FRAGMENT,GEOMETRY}].  In
> patches to follow, this will allow us to replace a lot of ad-hoc logic
> with a variable index into the array.
> 
> With the exception of the changes to mtypes.h, this patch was
> generated entirely by the command:
> 
>     find src -type f '(' -iname '*.c' -o -iname '*.cpp' -o -iname '*.py' \
>     -o -iname '*.y' ')' -print0 | xargs -0 sed -i \
>     -e 's/Const\.VertexProgram/Const.Program[MESA_SHADER_VERTEX]/g' \
>     -e 's/Const\.GeometryProgram/Const.Program[MESA_SHADER_GEOMETRY]/g' \
>     -e 's/Const\.FragmentProgram/Const.Program[MESA_SHADER_FRAGMENT]/g'
> 
> Suggested-by: Brian Paul <brianp at vmware.com>
> Reviewed-by: Brian Paul <brianp at vmware.com>
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
> 

Something bad happened here.

Jose


----- Forwarded Message -----
> mesa-ubuntu64 - Build # 10674 - Failure:
> 
> Log:
> [...truncated 290 lines...]
>   Compiling src/mesa/state_tracker/st_extensions.c ...
> src/mesa/state_tracker/st_extensions.c: In function 'st_init_limits':
> src/mesa/state_tracker/st_extensions.c:158:17: error: 'struct gl_constants'
> has no member named 'FragmentProgram'
> src/mesa/state_tracker/st_extensions.c:162:17: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:166:17: error: 'struct gl_constants'
> has no member named 'GeometryProgram'
> src/mesa/state_tracker/st_extensions.c:248:15: error: 'struct gl_constants'
> has no member named 'FragmentProgram'
> src/mesa/state_tracker/st_extensions.c:250:31: error: 'struct gl_constants'
> has no member named 'FragmentProgram'
> src/mesa/state_tracker/st_extensions.c:252:5: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:252:34: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:252:34: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:259:5: error: 'struct gl_constants'
> has no member named 'FragmentProgram'
> src/mesa/state_tracker/st_extensions.c:260:5: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:261:5: error: 'struct gl_constants'
> has no member named 'GeometryProgram'
> src/mesa/state_tracker/st_extensions.c:262:5: error: 'struct gl_constants'
> has no member named 'GeometryProgram'
> src/mesa/state_tracker/st_extensions.c:287:11: error: 'struct gl_constants'
> has no member named 'VertexProgram'
> src/mesa/state_tracker/st_extensions.c:288:11: error: 'struct gl_constants'
> has no member named 'GeometryProgram'
> src/mesa/state_tracker/st_extensions.c:289:11: error: 'struct gl_constants'
> has no member named 'FragmentProgram'
> scons: *** [build/linux-x86_64-checked/mesa/state_tracker/st_extensions.os]
> Error 1
> scons: building terminated because of errors.
> Build step 'Invoke SCons script' marked build as failure
> [WARNINGS] Skipping publisher since build result is FAILURE
> Archiving artifacts
> Email was triggered for: Failure
> Sending email for trigger: Failure
> 
> 
> Changes:
> Changes for Build #10674
> [stereotype441] mesa: replace ctx->Const.{Vertex,Fragment,Geomtery}Program
> with an array.
> 
> [stereotype441] mesa: Index into ctx->Const.Program[] rather than using
> ad-hoc code.
> 
> [stereotype441] glsl: Index into ctx->Const.Program[] rather than using
> ad-hoc code.
> 
> [stereotype441] main: Change init_program_limits() to use gl_shader_stage.
> 
> [stereotype441] mesa: Use functions to convert gl_shader_stage to PROGRAM
> enum or pipe target.
>