freedreno/ir3: relax restriction in grouping

[mesa.git] / src / gallium / drivers / r300 / r300_fs.c

diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index 429543a57462e324035bb1bd45b8f60f149d1b51..7d76c06ed6b11f259a1bd51d157046e9c0ea73a9 100644 (file)
--- a/src/gallium/drivers/r300/r300_fs.c
+++ b/src/gallium/drivers/r300/r300_fs.c
@@ -220,7 +220,7 @@ static void r300_dummy_fragment_shader(
     struct ureg_src imm;
 
     /* Make a simple fragment shader which outputs (0, 0, 0, 1) */
-    ureg = ureg_create(TGSI_PROCESSOR_FRAGMENT);
+    ureg = ureg_create(PIPE_SHADER_FRAGMENT);
     out = ureg_DECL_output(ureg, TGSI_SEMANTIC_COLOR, 0);
     imm = ureg_imm4f(ureg, 0, 0, 0, 1);
 
@@ -564,9 +564,10 @@ static void r300_translate_fragment_shader(
 boolean r300_pick_fragment_shader(struct r300_context* r300)
 {
     struct r300_fragment_shader* fs = r300_fs(r300);
-    struct r300_fragment_program_external_state state = {{{ 0 }}};
+    struct r300_fragment_program_external_state state;
     struct r300_fragment_shader_code* ptr;
 
+    memset(&state, 0, sizeof(state));
     get_external_state(r300, &state);
 
     if (!fs->first) {