AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965/fs: Remove the gl_program from the generator

Browse Source 
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2015-10-05 16:01:33 -07:00
parent 688d2e4585
commit 5e86f5b3d2
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_blorp_blit_eu.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ brw_blorp_eu_emitter::brw_blorp_eu_emitter(struct brw_context *brw,
generator(brw->intelScreen->compiler, 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, 0, false, "BLORP")
0, false, "BLORP")
{
if (debug_flag)
generator.enable_debug("blorp");
src/mesa/drivers/dri/i965/brw_fs.cpp
+2 -2
View File
@@ -5145,7 +5145,7 @@ brw_wm_fs_emit(struct brw_context *brw,
fs_generator g(brw->intelScreen->compiler, brw,
mem_ctx, (void *) key, &prog_data->base,
&fp->Base, v.promoted_constants, v.runtime_check_aads_emit, "FS");
v.promoted_constants, v.runtime_check_aads_emit, "FS");
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
char *name;
@@ -5301,7 +5301,7 @@ brw_cs_emit(struct brw_context *brw,
}
fs_generator g(brw->intelScreen->compiler, brw,
mem_ctx, (void*) key, &prog_data->base, &cp->Base,
mem_ctx, (void*) key, &prog_data->base,
v8.promoted_constants, v8.runtime_check_aads_emit, "CS");
if (INTEL_DEBUG & DEBUG_CS) {
char *name = ralloc_asprintf(mem_ctx, "%s compute shader %d",
src/mesa/drivers/dri/i965/brw_fs.h
-3
View File
@@ -400,7 +400,6 @@ public:
void *mem_ctx,
const void *key,
struct brw_stage_prog_data *prog_data,
struct gl_program *fp,
unsigned promoted_constants,
bool runtime_check_aads_emit,
const char *stage_abbrev);
@@ -499,8 +498,6 @@ private:
const void * const key;
struct brw_stage_prog_data * const prog_data;
const struct gl_program *prog;
unsigned dispatch_width; /**< 8 or 16 */
exec_list discard_halt_patches;
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+1 -2
View File
@@ -131,7 +131,6 @@ fs_generator::fs_generator(const struct brw_compiler *compiler, void *log_data,
void *mem_ctx,
const void *key,
struct brw_stage_prog_data *prog_data,
struct gl_program *prog,
unsigned promoted_constants,
bool runtime_check_aads_emit,
const char *stage_abbrev)
@@ -139,7 +138,7 @@ fs_generator::fs_generator(const struct brw_compiler *compiler, void *log_data,
: compiler(compiler), log_data(log_data),
devinfo(compiler->devinfo), key(key),
prog_data(prog_data),
prog(prog), promoted_constants(promoted_constants),
promoted_constants(promoted_constants),
runtime_check_aads_emit(runtime_check_aads_emit), debug_flag(false),
stage_abbrev(stage_abbrev), mem_ctx(mem_ctx)
{
src/mesa/drivers/dri/i965/brw_vec4.cpp
+1 -1
View File
@@ -1952,7 +1952,7 @@ brw_vs_emit(struct brw_context *brw,
fs_generator g(brw->intelScreen->compiler, brw,
mem_ctx, (void *) key, &prog_data->base.base,
&vp->Base, v.promoted_constants,
v.promoted_constants,
v.runtime_check_aads_emit, "VS");
if (INTEL_DEBUG & DEBUG_VS) {
char *name;