intel_miptree_create_for_teximage(struct brw_context *brw,
struct intel_texture_object *intelObj,
struct intel_texture_image *intelImage,
- bool expect_accelerated_upload)
+ uint32_t layout_flags)
{
GLuint lastLevel;
int width, height, depth;
intel_miptree_get_dimensions_for_image(&intelImage->base.Base,
&width, &height, &depth);
- DBG("%s\n", __FUNCTION__);
+ DBG("%s\n", __func__);
/* Figure out image dimensions at start level. */
for (i = intelImage->base.Base.Level; i > 0; i--) {
width,
height,
depth,
- expect_accelerated_upload,
intelImage->base.Base.NumSamples,
- INTEL_MIPTREE_TILING_ANY,
- false);
+ layout_flags | MIPTREE_LAYOUT_ALLOC_ANY_TILED);
}
static void
bool tex_busy = intelImage->mt && drm_intel_bo_busy(intelImage->mt->bo);
DBG("%s mesa_format %s target %s format %s type %s level %d %dx%dx%d\n",
- __FUNCTION__, _mesa_get_format_name(texImage->TexFormat),
- _mesa_lookup_enum_by_nr(texImage->TexObject->Target),
- _mesa_lookup_enum_by_nr(format), _mesa_lookup_enum_by_nr(type),
+ __func__, _mesa_get_format_name(texImage->TexFormat),
+ _mesa_enum_to_string(texImage->TexObject->Target),
+ _mesa_enum_to_string(format), _mesa_enum_to_string(type),
texImage->Level, texImage->Width, texImage->Height, texImage->Depth);
+ /* Allocate storage for texture data. */
+ if (!ctx->Driver.AllocTextureImageBuffer(ctx, texImage)) {
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims);
+ return;
+ }
+
+ assert(intelImage->mt);
+
ok = _mesa_meta_pbo_TexSubImage(ctx, dims, texImage, 0, 0, 0,
texImage->Width, texImage->Height,
texImage->Depth,
format, type, pixels,
- true, tex_busy, unpack);
+ false /*allocate_storage*/,
+ tex_busy, unpack);
if (ok)
return;
texImage->Height,
texImage->Depth,
format, type, pixels, unpack,
- true /*for_glTexImage*/);
+ false /*allocate_storage*/);
if (ok)
return;
DBG("%s: upload image %dx%dx%d pixels %p\n",
- __FUNCTION__, texImage->Width, texImage->Height, texImage->Depth,
+ __func__, texImage->Width, texImage->Height, texImage->Depth,
pixels);
_mesa_store_teximage(ctx, dims, texImage,
uint32_t offset,
GLuint width, GLuint height,
GLuint pitch,
- GLuint tile_x, GLuint tile_y)
+ GLuint tile_x, GLuint tile_y,
+ uint32_t layout_flags)
{
struct brw_context *brw = brw_context(ctx);
struct intel_texture_image *intel_image = intel_texture_image(image);
ctx->Driver.FreeTextureImageBuffer(ctx, image);
intel_image->mt = intel_miptree_create_for_bo(brw, bo, image->TexFormat,
- 0, width, height, 1, pitch);
+ 0, width, height, 1, pitch,
+ layout_flags);
if (intel_image->mt == NULL)
return;
intel_image->mt->target = target;
rb->Base.Base.Width,
rb->Base.Base.Height,
rb->mt->pitch,
- 0, 0);
+ 0, 0, 0);
_mesa_unlock_texture(&brw->ctx, texObj);
}
if (image == NULL)
return;
- /**
- * Images originating via EGL_EXT_image_dma_buf_import can be used only
- * with GL_OES_EGL_image_external only.
+ /* We support external textures only for EGLImages created with
+ * EGL_EXT_image_dma_buf_import. We may lift that restriction in the future.
*/
- if (image->dma_buf_imported && target != GL_TEXTURE_EXTERNAL_OES) {
- _mesa_error(ctx, GL_INVALID_OPERATION,
- "glEGLImageTargetTexture2DOES(dma buffers can be used with "
- "GL_OES_EGL_image_external only");
- return;
- }
-
if (target == GL_TEXTURE_EXTERNAL_OES && !image->dma_buf_imported) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glEGLImageTargetTexture2DOES(external target is enabled only "
return;
}
+ /* Disable creation of the texture's aux buffers because the driver exposes
+ * no EGL API to manage them. That is, there is no API for resolving the aux
+ * buffer's content to the main buffer nor for invalidating the aux buffer's
+ * content.
+ */
intel_set_texture_image_bo(ctx, texImage, image->bo,
target, image->internal_format,
image->format, image->offset,
image->width, image->height,
image->pitch,
- image->tile_x, image->tile_y);
+ image->tile_x, image->tile_y,
+ MIPTREE_LAYOUT_DISABLE_AUX);
}
/**
texImage->TexFormat == MESA_FORMAT_R8G8B8X8_UNORM)
return false;
- if (!intel_get_memcpy(texImage->TexFormat, format, type, &mem_copy, &cpp))
+ if (!intel_get_memcpy(texImage->TexFormat, format, type, &mem_copy, &cpp,
+ INTEL_DOWNLOAD))
return false;
/* If this is a nontrivial texture view, let another path handle it instead. */
error = brw_bo_map(brw, bo, false /* write enable */, "miptree");
if (error) {
- DBG("%s: failed to map bo\n", __FUNCTION__);
+ DBG("%s: failed to map bo\n", __func__);
return false;
}
DBG("%s: level=%d x,y=(%d,%d) (w,h)=(%d,%d) format=0x%x type=0x%x "
"mesa_format=0x%x tiling=%d "
"packing=(alignment=%d row_length=%d skip_pixels=%d skip_rows=%d)\n",
- __FUNCTION__, texImage->Level, xoffset, yoffset, width, height,
+ __func__, texImage->Level, xoffset, yoffset, width, height,
format, type, texImage->TexFormat, image->mt->tiling,
packing->Alignment, packing->RowLength, packing->SkipPixels,
packing->SkipRows);
}
static void
-intel_get_tex_image(struct gl_context *ctx,
- GLenum format, GLenum type, GLvoid *pixels,
- struct gl_texture_image *texImage) {
+intel_get_tex_sub_image(struct gl_context *ctx,
+ GLint xoffset, GLint yoffset, GLint zoffset,
+ GLsizei width, GLsizei height, GLint depth,
+ GLenum format, GLenum type, GLvoid *pixels,
+ struct gl_texture_image *texImage)
+{
struct brw_context *brw = brw_context(ctx);
bool ok;
- DBG("%s\n", __FUNCTION__);
+ DBG("%s\n", __func__);
if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
- if (_mesa_meta_pbo_GetTexSubImage(ctx, 3, texImage, 0, 0, 0,
- texImage->Width, texImage->Height,
- texImage->Depth, format, type,
- pixels, &ctx->Pack))
+ if (_mesa_meta_pbo_GetTexSubImage(ctx, 3, texImage,
+ xoffset, yoffset, zoffset,
+ width, height, depth, format, type,
+ pixels, &ctx->Pack)) {
+ /* Flush to guarantee coherency between the render cache and other
+ * caches the PBO could potentially be bound to after this point.
+ * See the related comment in intelReadPixels() for a more detailed
+ * explanation.
+ */
+ brw_emit_mi_flush(brw);
return;
+ }
- perf_debug("%s: fallback to CPU mapping in PBO case\n", __FUNCTION__);
+ perf_debug("%s: fallback to CPU mapping in PBO case\n", __func__);
}
- ok = intel_gettexsubimage_tiled_memcpy(ctx, texImage, 0, 0,
- texImage->Width, texImage->Height,
+ ok = intel_gettexsubimage_tiled_memcpy(ctx, texImage, xoffset, yoffset,
+ width, height,
format, type, pixels, &ctx->Pack);
if(ok)
return;
- _mesa_meta_GetTexImage(ctx, format, type, pixels, texImage);
+ _mesa_meta_GetTexSubImage(ctx, xoffset, yoffset, zoffset,
+ width, height, depth,
+ format, type, pixels, texImage);
- DBG("%s - DONE\n", __FUNCTION__);
+ DBG("%s - DONE\n", __func__);
}
void
functions->TexImage = intelTexImage;
functions->EGLImageTargetTexture2D = intel_image_target_texture_2d;
functions->BindRenderbufferTexImage = intel_bind_renderbuffer_tex_image;
- functions->GetTexImage = intel_get_tex_image;
+ functions->GetTexSubImage = intel_get_tex_sub_image;
}
projects / mesa.git / blobdiff