OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: replace ctx->Const.{Vertex,Fragment,Geomtery}Program with an array.

Browse Source 
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@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Paul Berry
2014-01-08 10:00:28 -08:00
parent 9b96be595b
commit 84732a982c
38 changed files with 302 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glsl/link_varyings.cpp
View File

@@ -1252,10 +1252,10 @@ check_against_output_limit(struct gl_context *ctx,
unsigned max_output_components;
switch (producer->Stage) {
case MESA_SHADER_VERTEX:
max_output_components = ctx->Const.VertexProgram.MaxOutputComponents;
max_output_components = ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents;
break;
case MESA_SHADER_GEOMETRY:
max_output_components = ctx->Const.GeometryProgram.MaxOutputComponents;
max_output_components = ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxOutputComponents;
break;
case MESA_SHADER_FRAGMENT:
default:
@@ -1301,10 +1301,10 @@ check_against_input_limit(struct gl_context *ctx,
unsigned max_input_components;
switch (consumer->Stage) {
case MESA_SHADER_GEOMETRY:
max_input_components = ctx->Const.GeometryProgram.MaxInputComponents;
max_input_components = ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxInputComponents;
break;
case MESA_SHADER_FRAGMENT:
max_input_components = ctx->Const.FragmentProgram.MaxInputComponents;
max_input_components = ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents;
break;
case MESA_SHADER_VERTEX:
default: