[Mesa-dev] [PATCH 1/6] i965/fs: Add stage variable to fs_generator

Jordan Justen jordan.l.justen at intel.com
Fri Sep 5 00:44:12 PDT 2014


This will allow for stage specific code paths.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 git://people.freedesktop.org/~jljusten/mesa for-upstream
 No piglit regressions seen on gen7.

 src/mesa/drivers/dri/i965/brw_fs.h             | 1 +
 src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 506f3ad..846efc7 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -679,6 +679,7 @@ private:
    struct gl_context *ctx;
 
    struct brw_compile *p;
+   gl_shader_stage stage;
    const struct brw_wm_prog_key *const key;
    struct brw_wm_prog_data *prog_data;
 
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index d860700..558e493 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -45,9 +45,10 @@ fs_generator::fs_generator(struct brw_context *brw,
                            bool runtime_check_aads_emit,
                            bool debug_flag)
 
-   : brw(brw), key(key), prog_data(prog_data), prog(prog), fp(fp),
-     runtime_check_aads_emit(runtime_check_aads_emit), debug_flag(debug_flag),
-     mem_ctx(mem_ctx)
+   : brw(brw), stage(MESA_SHADER_FRAGMENT), key(key),
+     prog_data(prog_data), prog(prog), fp(fp),
+     runtime_check_aads_emit(runtime_check_aads_emit),
+     debug_flag(debug_flag), mem_ctx(mem_ctx)
 {
    ctx = &brw->ctx;
 
-- 
2.1.0



More information about the mesa-dev mailing list