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

Paul Berry stereotype441 at kemper.freedesktop.org
Thu Jan 9 17:47:22 UTC 2014


Module: Mesa
Branch: master
Commit: b539385789a95074cc53c9e16988d2384ec5c7de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b539385789a95074cc53c9e16988d2384ec5c7de

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Wed Jan  8 10:17:01 2014 -0800

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

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

---

 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:




More information about the mesa-commit mailing list