}
static void
-brw_update_texture_surface(struct gl_context *ctx,
- unsigned unit,
- uint32_t *binding_table,
- unsigned surf_index)
+brw_update_texture_component(struct brw_context *brw,
+ uint32_t *binding_table_slot,
+ const struct intel_mipmap_tree *mt,
+ unsigned width, unsigned height,
+ unsigned depth, unsigned stride,
+ GLuint target, GLuint tex_format,
+ uint32_t offset, uint32_t levels,
+ uint32_t first_level)
{
- struct intel_context *intel = intel_context(ctx);
- struct brw_context *brw = brw_context(ctx);
- struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
- struct intel_texture_object *intelObj = intel_texture_object(tObj);
- struct intel_mipmap_tree *mt = intelObj->mt;
- struct gl_texture_image *firstImage = tObj->Image[0][tObj->BaseLevel];
- struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
- uint32_t *surf;
- int width, height, depth;
uint32_t tile_x, tile_y;
+ uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
+ 6 * 4, 32, binding_table_slot);
- if (tObj->Target == GL_TEXTURE_BUFFER) {
- brw_update_buffer_texture_surface(ctx, unit, binding_table, surf_index);
- return;
- }
-
- intel_miptree_get_dimensions_for_image(firstImage, &width, &height, &depth);
-
- surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
- 6 * 4, 32, &binding_table[surf_index]);
-
- surf[0] = (translate_tex_target(tObj->Target) << BRW_SURFACE_TYPE_SHIFT |
+ surf[0] = (target << BRW_SURFACE_TYPE_SHIFT |
BRW_SURFACE_MIPMAPLAYOUT_BELOW << BRW_SURFACE_MIPLAYOUT_SHIFT |
BRW_SURFACE_CUBEFACE_ENABLES |
- (translate_tex_format(intel,
- mt->format,
- firstImage->InternalFormat,
- tObj->DepthMode,
- sampler->sRGBDecode) <<
- BRW_SURFACE_FORMAT_SHIFT));
-
- surf[1] = intelObj->mt->region->bo->offset + intelObj->mt->offset; /* reloc */
- surf[1] += intel_miptree_get_tile_offsets(intelObj->mt, firstImage->Level, 0,
+ (tex_format << BRW_SURFACE_FORMAT_SHIFT));
+
+ surf[1] = mt->region->bo->offset + offset;
+ surf[1] += intel_miptree_get_tile_offsets(mt, first_level, 0,
&tile_x, &tile_y);
- surf[2] = ((intelObj->_MaxLevel - tObj->BaseLevel) << BRW_SURFACE_LOD_SHIFT |
+ surf[2] = (levels << BRW_SURFACE_LOD_SHIFT |
(width - 1) << BRW_SURFACE_WIDTH_SHIFT |
(height - 1) << BRW_SURFACE_HEIGHT_SHIFT);
- surf[3] = (brw_get_surface_tiling_bits(intelObj->mt->region->tiling) |
+ surf[3] = (brw_get_surface_tiling_bits(mt->region->tiling) |
(depth - 1) << BRW_SURFACE_DEPTH_SHIFT |
- (intelObj->mt->region->pitch - 1) <<
- BRW_SURFACE_PITCH_SHIFT);
+ (stride - 1) << BRW_SURFACE_PITCH_SHIFT);
- surf[4] = brw_get_surface_num_multisamples(intelObj->mt->num_samples);
+ surf[4] = brw_get_surface_num_multisamples(mt->num_samples);
assert(brw->has_surface_tile_offset || (tile_x == 0 && tile_y == 0));
/* Note that the low bits of these fields are missing, so
/* Emit relocation to surface contents */
drm_intel_bo_emit_reloc(brw->intel.batch.bo,
- binding_table[surf_index] + 4,
- intelObj->mt->region->bo,
- surf[1] - intelObj->mt->region->bo->offset,
- I915_GEM_DOMAIN_SAMPLER, 0);
+ *binding_table_slot + 4,
+ mt->region->bo,
+ surf[1] - mt->region->bo->offset,
+ I915_GEM_DOMAIN_SAMPLER, 0);
+}
+
+static void
+brw_update_ext_texture_surface(struct brw_context *brw,
+ uint32_t *binding_table_slots,
+ const struct intel_texture_image *intel_img)
+{
+ unsigned i;
+ const struct intel_region *region = intel_img->mt->region;
+ const struct intel_image_format *f = intel_img->ext_format;
+
+ for (i = 0; i < f->nplanes; ++i) {
+ int format = BRW_SURFACEFORMAT_R8_UNORM;
+ int index = f->planes[i].buffer_index;
+
+ if (f->planes[i].dri_format == __DRI_IMAGE_FORMAT_GR88)
+ format = BRW_SURFACEFORMAT_R8G8_UNORM;
+
+ brw_update_texture_component(brw, binding_table_slots + i,
+ intel_img->mt,
+ region->width >> f->planes[i].width_shift,
+ region->height >> f->planes[i].height_shift,
+ intel_img->base.Base.Depth,
+ intel_img->ext_strides[index],
+ BRW_SURFACE_2D,
+ format,
+ intel_img->ext_offsets[index],
+ 0 /*levels*/,
+ 0 /*first_level*/);
+ }
+}
+
+static void
+brw_update_texture_surface(struct gl_context *ctx,
+ unsigned unit,
+ uint32_t *binding_table,
+ unsigned surf_index)
+{
+ struct brw_context *brw = brw_context(ctx);
+ struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
+ struct intel_texture_object *intelObj = intel_texture_object(tObj);
+ struct intel_mipmap_tree *mt = intelObj->mt;
+ struct gl_texture_image *firstImage = tObj->Image[0][tObj->BaseLevel];
+ const struct intel_texture_image *intel_img =
+ (const struct intel_texture_image *)firstImage;
+ struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
+ int width, height, depth;
+
+ if (tObj->Target == GL_TEXTURE_BUFFER) {
+ brw_update_buffer_texture_surface(ctx, unit, binding_table, surf_index);
+ return;
+ }
+ else if (tObj->Target == GL_TEXTURE_EXTERNAL_OES && intel_img->ext_format) {
+ brw_update_ext_texture_surface(brw, binding_table + surf_index,
+ intel_img);
+ return;
+ }
+
+ intel_miptree_get_dimensions_for_image(firstImage, &width, &height, &depth);
+
+ brw_update_texture_component(brw, binding_table + surf_index,
+ mt, width, height, depth, mt->region->pitch,
+ translate_tex_target(tObj->Target),
+ translate_tex_format(intel_context(ctx), mt->format,
+ firstImage->InternalFormat, tObj->DepthMode, sampler->sRGBDecode),
+ mt->offset,
+ intelObj->_MaxLevel - tObj->BaseLevel,
+ firstImage->Level);
}
/**
unsigned num_samplers = _mesa_fls(vs->SamplersUsed | fs->SamplersUsed);
for (unsigned s = 0; s < num_samplers; s++) {
- brw->vs.surf_offset[SURF_INDEX_VS_TEXTURE(s)] = 0;
- brw->wm.surf_offset[SURF_INDEX_TEXTURE(s)] = 0;
-
if (vs->SamplersUsed & (1 << s)) {
const unsigned unit = vs->SamplerUnits[s];
/* _NEW_TEXTURE */
if (ctx->Texture.Unit[unit]._ReallyEnabled) {
intel->vtbl.update_texture_surface(ctx, unit,
- brw->vs.surf_offset,
- SURF_INDEX_VS_TEXTURE(s));
+ brw->vs.surf_offset,
+ brw_surf_index_vs_texture(
+ (const struct brw_vertex_program *)brw->vertex_program,
+ s));
}
}
/* _NEW_TEXTURE */
if (ctx->Texture.Unit[unit]._ReallyEnabled) {
intel->vtbl.update_texture_surface(ctx, unit,
- brw->wm.surf_offset,
- SURF_INDEX_TEXTURE(s));
+ brw->wm.surf_offset,
+ brw_surf_index_texture(
+ (const struct brw_fragment_program *)brw->fragment_program,
+ s));
}
}
}
OSDN Git Service
