From: Paul Berry <stereotype441@gmail.com>
Date: Wed, 8 Jan 2014 18:17:01 +0000 (-0800)
Subject: mesa: Index into ctx->Const.Program[] rather than using ad-hoc code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b539385789a95074cc53c9e16988d2384ec5c7de;p=mesa.git

mesa: Index into ctx->Const.Program[] rather than using ad-hoc code.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
index df4d75fddbd..3c19e8c60f0 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: