fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: Combine {brw,gen7}_update_texture_buffer_surface() functions.

Browse source 
Now that brw_update_texture_buffer_surface() uses the virtual
emit_buffer_surface_state() function, it works for Gen7+ too.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Kenneth Graunke 2013-11-01 20:05:27 -07:00
parent 7a974a645e
commit 39ebb72e52
3 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -1577,6 +1577,9 @@ void brw_create_constant_surface(struct brw_context *brw,
uint32_t size,
uint32_t *out_offset,
bool dword_pitch);
void brw_update_buffer_texture_surface(struct gl_context *ctx,
unsigned unit,
uint32_t *surf_offset);
void
brw_update_sol_surface(struct brw_context *brw,
struct gl_buffer_object *buffer_obj,

2
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -226,7 +226,7 @@ gen4_emit_buffer_surface_state(struct brw_context *brw,
}
}
static void
void
brw_update_buffer_texture_surface(struct gl_context *ctx,
unsigned unit,
uint32_t *surf_offset)

40
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
View file

@ -267,44 +267,6 @@ gen7_emit_buffer_surface_state(struct brw_context *brw,
gen7_check_surface_setup(surf, false /* is_render_target */);
}
static void
gen7_update_buffer_texture_surface(struct gl_context *ctx,
unsigned unit,
uint32_t *surf_offset)
{
struct brw_context *brw = brw_context(ctx);
struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
struct intel_buffer_object *intel_obj =
intel_buffer_object(tObj->BufferObject);
uint32_t size = tObj->BufferSize;
drm_intel_bo *bo = NULL;
if (intel_obj) {
size = MIN2(size, intel_obj->Base.Size);
bo = intel_bufferobj_buffer(brw, intel_obj, tObj->BufferOffset, size);
}
gl_format format = tObj->_BufferObjectFormat;
uint32_t surface_format = brw_format_for_mesa_format(format);
if (surface_format == 0 && format != MESA_FORMAT_RGBA_FLOAT32) {
_mesa_problem(NULL, "bad format %s for texture buffer\n",
_mesa_get_format_name(format));
}
int texel_size = _mesa_get_format_bytes(format);
gen7_emit_buffer_surface_state(brw,
surf_offset,
bo,
tObj->BufferOffset,
surface_format,
size / texel_size,
texel_size,
0 /* mocs */,
false /* rw */);
}
static void
gen7_update_texture_surface(struct gl_context *ctx,
unsigned unit,
@ -319,7 +281,7 @@ gen7_update_texture_surface(struct gl_context *ctx,
struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
if (tObj->Target == GL_TEXTURE_BUFFER) {
gen7_update_buffer_texture_surface(ctx, unit, surf_offset);
brw_update_buffer_texture_surface(ctx, unit, surf_offset);
return;
}