AlexIndustrial/mesa
1
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
src/glsl/main.cpp
+61 -61
View File
@@ -62,20 +62,20 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxTextureCoordUnits = 0;
ctx->Const.MaxTextureUnits = 8;
ctx->Const.VertexProgram.MaxAttribs = 8;
ctx->Const.VertexProgram.MaxTextureImageUnits = 0;
ctx->Const.VertexProgram.MaxUniformComponents = 128 * 4;
ctx->Const.VertexProgram.MaxInputComponents = 0; /* not used */
ctx->Const.VertexProgram.MaxOutputComponents = 32;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs = 8;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = 0;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents = 128 * 4;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxInputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents = 32;
ctx->Const.FragmentProgram.MaxTextureImageUnits =
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits =
ctx->Const.MaxCombinedTextureImageUnits;
ctx->Const.FragmentProgram.MaxUniformComponents = 16 * 4;
ctx->Const.FragmentProgram.MaxInputComponents =
ctx->Const.VertexProgram.MaxOutputComponents;
ctx->Const.FragmentProgram.MaxOutputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxUniformComponents = 16 * 4;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents =
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxOutputComponents = 0; /* not used */
ctx->Const.MaxVarying = ctx->Const.VertexProgram.MaxOutputComponents / 4;
ctx->Const.MaxVarying = ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents / 4;
break;
case 110:
case 120:
@@ -88,20 +88,20 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxTextureCoordUnits = 2;
ctx->Const.MaxTextureUnits = 2;
ctx->Const.VertexProgram.MaxAttribs = 16;
ctx->Const.VertexProgram.MaxTextureImageUnits = 0;
ctx->Const.VertexProgram.MaxUniformComponents = 512;
ctx->Const.VertexProgram.MaxInputComponents = 0; /* not used */
ctx->Const.VertexProgram.MaxOutputComponents = 32;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = 0;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents = 512;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxInputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents = 32;
ctx->Const.FragmentProgram.MaxTextureImageUnits =
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits =
ctx->Const.MaxCombinedTextureImageUnits;
ctx->Const.FragmentProgram.MaxUniformComponents = 64;
ctx->Const.FragmentProgram.MaxInputComponents =
ctx->Const.VertexProgram.MaxOutputComponents;
ctx->Const.FragmentProgram.MaxOutputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxUniformComponents = 64;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents =
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxOutputComponents = 0; /* not used */
ctx->Const.MaxVarying = ctx->Const.VertexProgram.MaxOutputComponents / 4;
ctx->Const.MaxVarying = ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents / 4;
break;
case 130:
case 140:
@@ -114,19 +114,19 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxTextureCoordUnits = 8;
ctx->Const.MaxTextureUnits = 2;
ctx->Const.VertexProgram.MaxAttribs = 16;
ctx->Const.VertexProgram.MaxTextureImageUnits = 16;
ctx->Const.VertexProgram.MaxUniformComponents = 1024;
ctx->Const.VertexProgram.MaxInputComponents = 0; /* not used */
ctx->Const.VertexProgram.MaxOutputComponents = 64;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxInputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents = 64;
ctx->Const.FragmentProgram.MaxTextureImageUnits = 16;
ctx->Const.FragmentProgram.MaxUniformComponents = 1024;
ctx->Const.FragmentProgram.MaxInputComponents =
ctx->Const.VertexProgram.MaxOutputComponents;
ctx->Const.FragmentProgram.MaxOutputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents =
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxOutputComponents = 0; /* not used */
ctx->Const.MaxVarying = ctx->Const.VertexProgram.MaxOutputComponents / 4;
ctx->Const.MaxVarying = ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents / 4;
break;
case 150:
case 330:
@@ -138,28 +138,28 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxTextureCoordUnits = 8;
ctx->Const.MaxTextureUnits = 2;
ctx->Const.VertexProgram.MaxAttribs = 16;
ctx->Const.VertexProgram.MaxTextureImageUnits = 16;
ctx->Const.VertexProgram.MaxUniformComponents = 1024;
ctx->Const.VertexProgram.MaxInputComponents = 0; /* not used */
ctx->Const.VertexProgram.MaxOutputComponents = 64;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxInputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents = 64;
ctx->Const.GeometryProgram.MaxTextureImageUnits = 16;
ctx->Const.GeometryProgram.MaxUniformComponents = 1024;
ctx->Const.GeometryProgram.MaxInputComponents =
ctx->Const.VertexProgram.MaxOutputComponents;
ctx->Const.GeometryProgram.MaxOutputComponents = 128;
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxInputComponents =
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents;
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxOutputComponents = 128;
ctx->Const.FragmentProgram.MaxTextureImageUnits = 16;
ctx->Const.FragmentProgram.MaxUniformComponents = 1024;
ctx->Const.FragmentProgram.MaxInputComponents =
ctx->Const.GeometryProgram.MaxOutputComponents;
ctx->Const.FragmentProgram.MaxOutputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents =
ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxOutputComponents;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxOutputComponents = 0; /* not used */
ctx->Const.MaxCombinedTextureImageUnits =
ctx->Const.VertexProgram.MaxTextureImageUnits
+ ctx->Const.GeometryProgram.MaxTextureImageUnits
+ ctx->Const.FragmentProgram.MaxTextureImageUnits;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits
+ ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits
+ ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits;
ctx->Const.MaxGeometryOutputVertices = 256;
ctx->Const.MaxGeometryTotalOutputComponents = 1024;
@@ -178,18 +178,18 @@ initialize_context(struct gl_context *ctx, gl_api api)
ctx->Const.MaxTextureCoordUnits = 0;
ctx->Const.MaxTextureUnits = 0;
ctx->Const.VertexProgram.MaxAttribs = 16;
ctx->Const.VertexProgram.MaxTextureImageUnits = 16;
ctx->Const.VertexProgram.MaxUniformComponents = 1024;
ctx->Const.VertexProgram.MaxInputComponents = 0; /* not used */
ctx->Const.VertexProgram.MaxOutputComponents = 16 * 4;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxUniformComponents = 1024;
ctx->Const.Program[MESA_SHADER_VERTEX].MaxInputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_VERTEX].MaxOutputComponents = 16 * 4;
ctx->Const.FragmentProgram.MaxTextureImageUnits = 16;
ctx->Const.FragmentProgram.MaxUniformComponents = 224;
ctx->Const.FragmentProgram.MaxInputComponents = 15 * 4;
ctx->Const.FragmentProgram.MaxOutputComponents = 0; /* not used */
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = 16;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxUniformComponents = 224;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents = 15 * 4;
ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxOutputComponents = 0; /* not used */
ctx->Const.MaxVarying = ctx->Const.FragmentProgram.MaxInputComponents / 4;
ctx->Const.MaxVarying = ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents / 4;
break;
}