From 327161a48dcff9ec082ba5365ffa41bf0cbec3e4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 25 May 2016 17:41:59 -0700 Subject: [PATCH] i965/test: Remove the fragment/vertex_program field from test visitors MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit None of them are actually using it. It's a relic of an older compiler interface that required a gl_program. Reviewed-by: Emil Velikov Reviewed-by: Kristian Høgsberg --- src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp | 4 ---- src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp | 4 ---- src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp | 5 ----- src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp | 5 ----- src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp | 5 ----- 5 files changed, 23 deletions(-) diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp index 034d8a507fe..7cd72453b3f 100644 --- a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp @@ -37,7 +37,6 @@ public: struct gl_context *ctx; struct brw_wm_prog_data *prog_data; struct gl_shader_program *shader_prog; - struct brw_fragment_program *fp; fs_visitor *v; }; @@ -60,14 +59,11 @@ void cmod_propagation_test::SetUp() devinfo = (struct brw_device_info *)calloc(1, sizeof(*devinfo)); compiler->devinfo = devinfo; - fp = ralloc(NULL, struct brw_fragment_program); prog_data = ralloc(NULL, struct brw_wm_prog_data); nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_FRAGMENT, NULL); v = new cmod_propagation_fs_visitor(compiler, prog_data, shader); - _mesa_init_gl_program(&fp->program.Base, GL_FRAGMENT_SHADER, 0); - devinfo->gen = 4; } diff --git a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp b/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp index 7b3b9e534b3..06caaad7b10 100644 --- a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp @@ -37,7 +37,6 @@ public: struct gl_context *ctx; struct brw_wm_prog_data *prog_data; struct gl_shader_program *shader_prog; - struct brw_fragment_program *fp; fs_visitor *v; }; @@ -60,14 +59,11 @@ void saturate_propagation_test::SetUp() devinfo = (struct brw_device_info *)calloc(1, sizeof(*devinfo)); compiler->devinfo = devinfo; - fp = ralloc(NULL, struct brw_fragment_program); prog_data = ralloc(NULL, struct brw_wm_prog_data); nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_FRAGMENT, NULL); v = new saturate_propagation_fs_visitor(compiler, prog_data, shader); - _mesa_init_gl_program(&fp->program.Base, GL_FRAGMENT_SHADER, 0); - devinfo->gen = 4; } diff --git a/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp index 0b74165bcf7..1b6a9e7eafc 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_cmod_propagation.cpp @@ -39,7 +39,6 @@ public: struct brw_device_info *devinfo; struct gl_context *ctx; struct gl_shader_program *shader_prog; - struct brw_vertex_program *vp; struct brw_vue_prog_data *prog_data; vec4_visitor *v; }; @@ -103,14 +102,10 @@ void cmod_propagation_test::SetUp() prog_data = (struct brw_vue_prog_data *)calloc(1, sizeof(*prog_data)); compiler->devinfo = devinfo; - vp = ralloc(NULL, struct brw_vertex_program); - nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_VERTEX, NULL); v = new cmod_propagation_vec4_visitor(compiler, shader, prog_data); - _mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0); - devinfo->gen = 4; } diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp index 0638246d24f..901f12a773d 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp @@ -38,7 +38,6 @@ public: struct brw_device_info *devinfo; struct gl_context *ctx; struct gl_shader_program *shader_prog; - struct brw_vertex_program *vp; struct brw_vue_prog_data *prog_data; vec4_visitor *v; }; @@ -96,14 +95,10 @@ void copy_propagation_test::SetUp() prog_data = (struct brw_vue_prog_data *)calloc(1, sizeof(*prog_data)); compiler->devinfo = devinfo; - vp = ralloc(NULL, struct brw_vertex_program); - nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_VERTEX, NULL); v = new copy_propagation_vec4_visitor(compiler, shader, prog_data); - _mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0); - devinfo->gen = 4; } diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp index 1873d9ca16e..944c7386c06 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp @@ -40,7 +40,6 @@ public: struct brw_device_info *devinfo; struct gl_context *ctx; struct gl_shader_program *shader_prog; - struct brw_vertex_program *vp; struct brw_vue_prog_data *prog_data; vec4_visitor *v; }; @@ -99,14 +98,10 @@ void register_coalesce_test::SetUp() prog_data = (struct brw_vue_prog_data *)calloc(1, sizeof(*prog_data)); compiler->devinfo = devinfo; - vp = ralloc(NULL, struct brw_vertex_program); - nir_shader *shader = nir_shader_create(NULL, MESA_SHADER_VERTEX, NULL); v = new register_coalesce_vec4_visitor(compiler, shader, prog_data); - _mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0); - devinfo->gen = 4; } -- 2.30.2