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

i965: Virtualize emit_buffer_surface_state().

Browse Source 
This entails adding "mocs" and "rw" parameters to the Gen4-5 version.
I made it actually pay attention to the rw flag (even though it is
always false), but mocs is always ignored.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Kenneth Graunke
2013-10-25 11:37:06 -07:00
parent e3854fe194
commit ba836e02a3
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_context.h
+9
View File
@@ -989,6 +989,15 @@ struct brw_context
uint32_t size,
uint32_t *out_offset,
bool rw);
void (*emit_buffer_surface_state)(struct brw_context *brw,
uint32_t *out_offset,
drm_intel_bo *bo,
unsigned buffer_offset,
unsigned surface_format,
unsigned buffer_size,
unsigned pitch,
unsigned mocs,
bool rw);
/** Upload a SAMPLER_STATE table. */
void (*upload_sampler_state_table)(struct brw_context *brw,
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+10 -4
View File
@@ -197,7 +197,9 @@ gen4_emit_buffer_surface_state(struct brw_context *brw,
unsigned buffer_offset,
unsigned surface_format,
unsigned buffer_size,
unsigned pitch)
unsigned pitch,
unsigned mocs,
bool rw)
{
uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
6 * 4, 32, out_offset);
@@ -219,7 +221,8 @@ gen4_emit_buffer_surface_state(struct brw_context *brw,
if (bo) {
drm_intel_bo_emit_reloc(brw->batch.bo, *out_offset + 4,
bo, buffer_offset,
I915_GEM_DOMAIN_SAMPLER, 0);
I915_GEM_DOMAIN_SAMPLER,
(rw ? I915_GEM_DOMAIN_SAMPLER : 0));
}
}
@@ -252,7 +255,9 @@ brw_update_buffer_texture_surface(struct gl_context *ctx,
tObj->BufferOffset,
brw_format,
size / texel_size,
texel_size);
texel_size,
0,
false);
}
static void
@@ -329,7 +334,7 @@ brw_create_constant_surface(struct brw_context *brw,
gen4_emit_buffer_surface_state(brw, out_offset, bo, offset,
BRW_SURFACEFORMAT_R32G32B32A32_FLOAT,
elements, stride);
elements, stride, 0, false);
}
/**
@@ -927,4 +932,5 @@ gen4_init_vtable_surface_functions(struct brw_context *brw)
brw->vtbl.update_null_renderbuffer_surface =
brw_update_null_renderbuffer_surface;
brw->vtbl.create_constant_surface = brw_create_constant_surface;
brw->vtbl.emit_buffer_surface_state = gen4_emit_buffer_surface_state;
}
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+1
View File
@@ -615,4 +615,5 @@ gen7_init_vtable_surface_functions(struct brw_context *brw)
gen7_update_null_renderbuffer_surface;
brw->vtbl.create_constant_surface = gen7_create_constant_surface;
brw->vtbl.create_raw_surface = gen7_create_raw_surface;
brw->vtbl.emit_buffer_surface_state = gen7_emit_buffer_surface_state;
}