Mesa (master): st/mesa: use pipe_shader_type_from_mesa

Nicolai Hähnle nh at kemper.freedesktop.org
Wed Jul 5 10:32:00 UTC 2017


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

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed May 17 18:09:14 2017 +0200

st/mesa: use pipe_shader_type_from_mesa

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 7852941acd..7c64a3897e 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -6747,27 +6747,8 @@ st_translate_program(
 
       for (i = program->shader->Stage+1; i <= MESA_SHADER_FRAGMENT; i++) {
          if (program->shader_program->_LinkedShaders[i]) {
-            unsigned next;
-
-            switch (i) {
-            case MESA_SHADER_TESS_CTRL:
-               next = PIPE_SHADER_TESS_CTRL;
-               break;
-            case MESA_SHADER_TESS_EVAL:
-               next = PIPE_SHADER_TESS_EVAL;
-               break;
-            case MESA_SHADER_GEOMETRY:
-               next = PIPE_SHADER_GEOMETRY;
-               break;
-            case MESA_SHADER_FRAGMENT:
-               next = PIPE_SHADER_FRAGMENT;
-               break;
-            default:
-               assert(0);
-               continue;
-            }
-
-            ureg_set_next_shader_processor(ureg, next);
+            ureg_set_next_shader_processor(
+                  ureg, pipe_shader_type_from_mesa((gl_shader_stage)i));
             break;
          }
       }




More information about the mesa-commit mailing list