From a07cf3397e332388d3599c83e50ac45511972890 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 27 Mar 2012 09:37:40 -0700 Subject: [PATCH] i965: Add support for sampling texture buffer objects on gen7+. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_wm.c | 2 +- src/mesa/drivers/dri/i965/gen7_sampler_state.c | 4 ++ src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 62 +++++++++++++++++++++++ src/mesa/drivers/dri/intel/intel_tex_validate.c | 4 ++ 4 files changed, 71 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index e59ab622c6c..b358306a928 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -328,7 +328,7 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx, { const struct gl_texture_unit *unit = &ctx->Texture.Unit[i]; - if (unit->_ReallyEnabled) { + if (unit->_ReallyEnabled && unit->_Current->Target != GL_TEXTURE_BUFFER) { const struct gl_texture_object *t = unit->_Current; const struct gl_texture_image *img = t->Image[0][t->BaseLevel]; struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, i); diff --git a/src/mesa/drivers/dri/i965/gen7_sampler_state.c b/src/mesa/drivers/dri/i965/gen7_sampler_state.c index d2699a15911..0cf62298412 100644 --- a/src/mesa/drivers/dri/i965/gen7_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sampler_state.c @@ -43,6 +43,10 @@ gen7_update_sampler_state(struct brw_context *brw, int unit, struct gl_sampler_object *gl_sampler = _mesa_get_samplerobj(ctx, unit); bool using_nearest = false; + /* These don't use samplers at all. */ + if (texObj->Target == GL_TEXTURE_BUFFER) + return; + switch (gl_sampler->MinFilter) { case GL_NEAREST: sampler->ss0.min_filter = BRW_MAPFILTER_NEAREST; diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c index 439d8b082ca..cbccd2b852d 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -28,6 +28,7 @@ #include "intel_batchbuffer.h" #include "intel_tex.h" #include "intel_fbo.h" +#include "intel_buffer_objects.h" #include "brw_context.h" #include "brw_state.h" @@ -54,6 +55,62 @@ gen7_set_surface_tiling(struct gen7_surface_state *surf, uint32_t tiling) } static void +gen7_update_buffer_texture_surface(struct gl_context *ctx, GLuint unit) +{ + struct brw_context *brw = brw_context(ctx); + struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current; + const GLuint surf_index = SURF_INDEX_TEXTURE(unit); + struct gen7_surface_state *surf; + struct intel_buffer_object *intel_obj = + intel_buffer_object(tObj->BufferObject); + drm_intel_bo *bo = intel_obj ? intel_obj->buffer : NULL; + gl_format format = tObj->_BufferObjectFormat; + int texel_size = _mesa_get_format_bytes(format); + + surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, + sizeof(*surf), 32, &brw->wm.surf_offset[surf_index]); + memset(surf, 0, sizeof(*surf)); + + surf->ss0.surface_type = BRW_SURFACE_BUFFER; + surf->ss0.surface_format = brw_format_for_mesa_format(format); + + surf->ss0.render_cache_read_write = 1; + + if (surf->ss0.surface_format == 0 && format != MESA_FORMAT_RGBA_FLOAT32) { + _mesa_problem(NULL, "bad format %s for texture buffer\n", + _mesa_get_format_name(format)); + } + + if (bo) { + surf->ss1.base_addr = bo->offset; /* reloc */ + + /* Emit relocation to surface contents. Section 5.1.1 of the gen4 + * bspec ("Data Cache") says that the data cache does not exist as + * a separate cache and is just the sampler cache. + */ + drm_intel_bo_emit_reloc(brw->intel.batch.bo, + (brw->wm.surf_offset[surf_index] + + offsetof(struct gen7_surface_state, ss1)), + bo, 0, + I915_GEM_DOMAIN_SAMPLER, 0); + + int w = intel_obj->Base.Size / texel_size; + surf->ss2.width = w & 0x7f; /* bits 6:0 of size or width */ + surf->ss2.height = (w >> 7) & 0x1fff; /* bits 19:7 of size or width */ + surf->ss3.depth = (w >> 20) & 0x7f; /* bits 26:20 of size or width */ + surf->ss3.pitch = texel_size - 1; +} else { + surf->ss1.base_addr = 0; + surf->ss2.width = 0; + surf->ss2.height = 0; + surf->ss3.depth = 0; + surf->ss3.pitch = 0; + } + + gen7_set_surface_tiling(surf, I915_TILING_NONE); +} + +static void gen7_update_texture_surface(struct gl_context *ctx, GLuint unit) { struct brw_context *brw = brw_context(ctx); @@ -66,6 +123,11 @@ gen7_update_texture_surface(struct gl_context *ctx, GLuint unit) struct gen7_surface_state *surf; int width, height, depth; + if (tObj->Target == GL_TEXTURE_BUFFER) { + gen7_update_buffer_texture_surface(ctx, unit); + return; + } + intel_miptree_get_dimensions_for_image(firstImage, &width, &height, &depth); surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE, diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c index 0f4a1a83193..256c21ec826 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_validate.c +++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c @@ -43,6 +43,10 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) struct intel_texture_image *firstImage; int width, height, depth; + /* TBOs require no validation -- they always just point to their BO. */ + if (tObj->Target == GL_TEXTURE_BUFFER) + return true; + /* We know/require this is true by now: */ assert(intelObj->base._BaseComplete); -- 2.11.0