[Mesa-dev] [PATCH 2/5] mesa: Index into ctx->Const.Program[] rather than using ad-hoc code.

[Paul Berry]

---
 src/mesa/program/program.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index df4d75f..3c19e8c 100644
--- a/src/mesa/program/program.c
+++ b/src/mesa/program/program.c
@@ -896,21 +896,8 @@ _mesa_valid_register_index(const struct gl_context *ctx,
 {
    const struct gl_program_constants *c;
 
-   switch (shaderType) {
-   case MESA_SHADER_VERTEX:
-      c = &ctx->Const.Program[MESA_SHADER_VERTEX];
-      break;
-   case MESA_SHADER_FRAGMENT:
-      c = &ctx->Const.Program[MESA_SHADER_FRAGMENT];
-      break;
-   case MESA_SHADER_GEOMETRY:
-      c = &ctx->Const.Program[MESA_SHADER_GEOMETRY];
-      break;
-   default:
-      _mesa_problem(ctx,
-                    "unexpected shader type in _mesa_valid_register_index()");
-      return GL_FALSE;
-   }
+   assert(0 <= shaderType && shaderType < MESA_SHADER_STAGES);
+   c = &ctx->Const.Program[shaderType];
 
    switch (file) {
    case PROGRAM_UNDEFINED:
-- 
1.8.5.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev