Mesa (master): i965: Remove shader program argument and member from fs_generator
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed Dec 10 20:45:05 UTC 2014
Module: Mesa
Branch: master
Commit: 686ef091a4f76fa68d9d9cd5ef00f40c1416a5da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=686ef091a4f76fa68d9d9cd5ef00f40c1416a5da
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon Oct 27 19:43:31 2014 -0700
i965: Remove shader program argument and member from fs_generator
Now that the caller passes in the shader debug name, we don't need this
anymore.
Signed-off-by: Kristian Høgsberg <krh at bitplanet.net>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs.h | 2 --
src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 3 +--
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
index f6d0b68..83fccc2 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
@@ -31,7 +31,7 @@ brw_blorp_eu_emitter::brw_blorp_eu_emitter(struct brw_context *brw,
: mem_ctx(ralloc_context(NULL)),
generator(brw, mem_ctx, (void *) rzalloc(mem_ctx, struct brw_wm_prog_key),
(struct brw_stage_prog_data *) rzalloc(mem_ctx, struct brw_wm_prog_data),
- NULL, NULL, false)
+ NULL, false)
{
if (debug_flag)
generator.enable_debug("blorp");
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index feca1e7..a0fb565 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3716,7 +3716,7 @@ brw_wm_fs_emit(struct brw_context *brw,
prog_data->no_8 = false;
}
- fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base, prog,
+ fs_generator g(brw, mem_ctx, (void *) key, &prog_data->base,
&fp->Base, v.runtime_check_aads_emit);
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index ce9f3b8..f0e6f25 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -691,7 +691,6 @@ public:
void *mem_ctx,
const void *key,
struct brw_stage_prog_data *prog_data,
- struct gl_shader_program *shader_prog,
struct gl_program *fp,
bool runtime_check_aads_emit);
~fs_generator();
@@ -797,7 +796,6 @@ private:
const void * const key;
struct brw_stage_prog_data * const prog_data;
- struct gl_shader_program * const shader_prog;
const struct gl_program *prog;
unsigned dispatch_width; /**< 8 or 16 */
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 1d88fda..95bdfc1 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -124,12 +124,11 @@ fs_generator::fs_generator(struct brw_context *brw,
void *mem_ctx,
const void *key,
struct brw_stage_prog_data *prog_data,
- struct gl_shader_program *shader_prog,
struct gl_program *prog,
bool runtime_check_aads_emit)
: brw(brw), key(key),
- prog_data(prog_data), shader_prog(shader_prog),
+ prog_data(prog_data),
prog(prog), runtime_check_aads_emit(runtime_check_aads_emit),
debug_flag(false), mem_ctx(mem_ctx)
{
More information about the mesa-commit
mailing list