Module: Mesa Branch: master Commit: 000a9ee1ba5b1ac1278af6f8d20c8873f9ea8701 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=000a9ee1ba5b1ac1278af6f8d20c8873f9ea8701
Author: Jordan Justen <[email protected]> Date: Tue Sep 2 22:50:44 2014 -0700 i965/fs: Add stage variable to fs_generator This will allow for stage specific code paths. Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
