[Mesa-dev] [PATCH] r600: Rewrite r600_shader_selector_key() to use a switch stmt

[Edward O'Callaghan]

From: Edward O'Callaghan <eocallag...@alterapraxis.com>

Signed-off-by: Edward O'Callaghan <eocallag...@alterapraxis.com>
---
 src/gallium/drivers/r600/r600_state_common.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_state_common.c 
b/src/gallium/drivers/r600/r600_state_common.c
index aa4a8d0..c7445b8 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -709,7 +709,18 @@ static inline struct r600_shader_key 
r600_shader_selector_key(struct pipe_contex
        struct r600_shader_key key;
        memset(&key, 0, sizeof(key));
 
-       if (sel->type == PIPE_SHADER_FRAGMENT) {
+       switch (sel->type) {
+       case PIPE_SHADER_VERTEX: {
+               key.vs_as_es = (rctx->gs_shader != NULL);
+               if (rctx->ps_shader->current->shader.gs_prim_id_input && 
!rctx->gs_shader) {
+                       key.vs_as_gs_a = true;
+                       key.vs_prim_id_out = 
rctx->ps_shader->current->shader.input[rctx->ps_shader->current->shader.ps_prim_id_input].spi_sid;
+               }
+               break;
+       }
+       case PIPE_SHADER_GEOMETRY:
+               break;
+       case PIPE_SHADER_FRAGMENT: {
                key.color_two_side = rctx->rasterizer && 
rctx->rasterizer->two_side;
                key.alpha_to_one = rctx->alpha_to_one &&
                                   rctx->rasterizer && 
rctx->rasterizer->multisample_enable &&
@@ -718,13 +729,12 @@ static inline struct r600_shader_key 
r600_shader_selector_key(struct pipe_contex
                /* Dual-source blending only makes sense with nr_cbufs == 1. */
                if (key.nr_cbufs == 1 && rctx->dual_src_blend)
                        key.nr_cbufs = 2;
-       } else if (sel->type == PIPE_SHADER_VERTEX) {
-               key.vs_as_es = (rctx->gs_shader != NULL);
-               if (rctx->ps_shader->current->shader.gs_prim_id_input && 
!rctx->gs_shader) {
-                       key.vs_as_gs_a = true;
-                       key.vs_prim_id_out = 
rctx->ps_shader->current->shader.input[rctx->ps_shader->current->shader.ps_prim_id_input].spi_sid;
-               }
+               break;
        }
+       default:
+               assert(0);
+       }
+
        return key;
 }
 
-- 
2.4.3

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