[Mesa-dev] [PATCH 2/5] i965: Move TexSubImage functions to intel_tex_image.c
Kenneth Graunke
kenneth at whitecape.org
Fri Sep 15 03:10:47 UTC 2017
From: Jason Ekstrand <jason.ekstrand at intel.com>
These two paths are basically the same. There's no good reason to have
them in different files.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/Makefile.sources | 1 -
src/mesa/drivers/dri/i965/brw_context.c | 1 -
src/mesa/drivers/dri/i965/intel_tex.h | 2 -
src/mesa/drivers/dri/i965/intel_tex_image.c | 210 ++++++++++++++++++++
src/mesa/drivers/dri/i965/intel_tex_subimage.c | 256 -------------------------
5 files changed, 210 insertions(+), 260 deletions(-)
delete mode 100644 src/mesa/drivers/dri/i965/intel_tex_subimage.c
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index e33dea07128..a701b6a3579 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -106,7 +106,6 @@ i965_FILES = \
intel_tex.h \
intel_tex_image.c \
intel_tex_obj.h \
- intel_tex_subimage.c \
intel_tex_validate.c \
intel_tiled_memcpy.c \
intel_tiled_memcpy.h \
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 6441311d47e..f67c30f3aa4 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -282,7 +282,6 @@ brw_init_driver_functions(struct brw_context *brw,
intelInitTextureFuncs(functions);
intelInitTextureImageFuncs(functions);
- intelInitTextureSubImageFuncs(functions);
intelInitTextureCopyImageFuncs(functions);
intelInitCopyImageFuncs(functions);
intelInitClearFuncs(functions);
diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/intel_tex.h
index f1b55c706ea..2c5913ad2d1 100644
--- a/src/mesa/drivers/dri/i965/intel_tex.h
+++ b/src/mesa/drivers/dri/i965/intel_tex.h
@@ -35,8 +35,6 @@ void intelInitTextureFuncs(struct dd_function_table *functions);
void intelInitTextureImageFuncs(struct dd_function_table *functions);
-void intelInitTextureSubImageFuncs(struct dd_function_table *functions);
-
void intelInitTextureCopyImageFuncs(struct dd_function_table *functions);
void intelInitCopyImageFuncs(struct dd_function_table *functions);
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 4661581244e..b8318a5719f 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -127,6 +127,169 @@ intel_miptree_create_for_teximage(struct brw_context *brw,
flags);
}
+
+/**
+ * \brief A fast path for glTexImage and glTexSubImage.
+ *
+ * \param for_glTexImage Was this called from glTexImage or glTexSubImage?
+ *
+ * This fast path is taken when the texture format is BGRA, RGBA,
+ * A or L and when the texture memory is X- or Y-tiled. It uploads
+ * the texture data by mapping the texture memory without a GTT fence, thus
+ * acquiring a tiled view of the memory, and then copying sucessive
+ * spans within each tile.
+ *
+ * This is a performance win over the conventional texture upload path because
+ * it avoids the performance penalty of writing through the write-combine
+ * buffer. In the conventional texture upload path,
+ * texstore.c:store_texsubimage(), the texture memory is mapped through a GTT
+ * fence, thus acquiring a linear view of the memory, then each row in the
+ * image is memcpy'd. In this fast path, we replace each row's copy with
+ * a sequence of copies over each linear span in tile.
+ *
+ * One use case is Google Chrome's paint rectangles. Chrome (as
+ * of version 21) renders each page as a tiling of 256x256 GL_BGRA textures.
+ * Each page's content is initially uploaded with glTexImage2D and damaged
+ * regions are updated with glTexSubImage2D. On some workloads, the
+ * performance gain of this fastpath on Sandybridge is over 5x.
+ */
+bool
+intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
+ GLuint dims,
+ struct gl_texture_image *texImage,
+ GLint xoffset, GLint yoffset, GLint zoffset,
+ GLsizei width, GLsizei height, GLsizei depth,
+ GLenum format, GLenum type,
+ const GLvoid *pixels,
+ const struct gl_pixelstore_attrib *packing,
+ bool for_glTexImage)
+{
+ struct brw_context *brw = brw_context(ctx);
+ const struct gen_device_info *devinfo = &brw->screen->devinfo;
+ struct intel_texture_image *image = intel_texture_image(texImage);
+ int src_pitch;
+
+ /* The miptree's buffer. */
+ struct brw_bo *bo;
+
+ uint32_t cpp;
+ mem_copy_fn mem_copy = NULL;
+
+ /* This fastpath is restricted to specific texture types:
+ * a 2D BGRA, RGBA, L8 or A8 texture. It could be generalized to support
+ * more types.
+ *
+ * FINISHME: The restrictions below on packing alignment and packing row
+ * length are likely unneeded now because we calculate the source stride
+ * with _mesa_image_row_stride. However, before removing the restrictions
+ * we need tests.
+ */
+ if (!devinfo->has_llc ||
+ !(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
+ !(texImage->TexObject->Target == GL_TEXTURE_2D ||
+ texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||
+ pixels == NULL ||
+ _mesa_is_bufferobj(packing->BufferObj) ||
+ packing->Alignment > 4 ||
+ packing->SkipPixels > 0 ||
+ packing->SkipRows > 0 ||
+ (packing->RowLength != 0 && packing->RowLength != width) ||
+ packing->SwapBytes ||
+ packing->LsbFirst ||
+ packing->Invert)
+ return false;
+
+ /* Only a simple blit, no scale, bias or other mapping. */
+ if (ctx->_ImageTransferState)
+ return false;
+
+ if (!intel_get_memcpy(texImage->TexFormat, format, type, &mem_copy, &cpp))
+ return false;
+
+ /* If this is a nontrivial texture view, let another path handle it instead. */
+ if (texImage->TexObject->MinLayer)
+ return false;
+
+ if (for_glTexImage)
+ ctx->Driver.AllocTextureImageBuffer(ctx, texImage);
+
+ if (!image->mt ||
+ (image->mt->surf.tiling != ISL_TILING_X &&
+ image->mt->surf.tiling != ISL_TILING_Y0)) {
+ /* The algorithm is written only for X- or Y-tiled memory. */
+ return false;
+ }
+
+ /* linear_to_tiled() assumes that if the object is swizzled, it is using
+ * I915_BIT6_SWIZZLE_9_10 for X and I915_BIT6_SWIZZLE_9 for Y. This is only
+ * true on gen5 and above.
+ *
+ * The killer on top is that some gen4 have an L-shaped swizzle mode, where
+ * parts of the memory aren't swizzled at all. Userspace just can't handle
+ * that.
+ */
+ if (devinfo->gen < 5 && brw->has_swizzling)
+ return false;
+
+ int level = texImage->Level + texImage->TexObject->MinLevel;
+
+ /* Since we are going to write raw data to the miptree, we need to resolve
+ * any pending fast color clears before we start.
+ */
+ assert(image->mt->surf.logical_level0_px.depth == 1);
+ assert(image->mt->surf.logical_level0_px.array_len == 1);
+
+ intel_miptree_access_raw(brw, image->mt, level, 0, true);
+
+ bo = image->mt->bo;
+
+ if (brw_batch_references(&brw->batch, bo)) {
+ perf_debug("Flushing before mapping a referenced bo.\n");
+ intel_batchbuffer_flush(brw);
+ }
+
+ void *map = brw_bo_map(brw, bo, MAP_WRITE | MAP_RAW);
+ if (map == NULL) {
+ DBG("%s: failed to map bo\n", __func__);
+ return false;
+ }
+
+ src_pitch = _mesa_image_row_stride(packing, width, format, type);
+
+ /* We postponed printing this message until having committed to executing
+ * the function.
+ */
+ DBG("%s: level=%d offset=(%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) "
+ "for_glTexImage=%d\n",
+ __func__, texImage->Level, xoffset, yoffset, width, height,
+ format, type, texImage->TexFormat, image->mt->surf.tiling,
+ packing->Alignment, packing->RowLength, packing->SkipPixels,
+ packing->SkipRows, for_glTexImage);
+
+ /* Adjust x and y offset based on miplevel */
+ unsigned level_x, level_y;
+ intel_miptree_get_image_offset(image->mt, level, 0, &level_x, &level_y);
+ xoffset += level_x;
+ yoffset += level_y;
+
+ linear_to_tiled(
+ xoffset * cpp, (xoffset + width) * cpp,
+ yoffset, yoffset + height,
+ map,
+ pixels - (ptrdiff_t) yoffset * src_pitch - (ptrdiff_t) xoffset * cpp,
+ image->mt->surf.row_pitch, src_pitch,
+ brw->has_swizzling,
+ image->mt->surf.tiling,
+ mem_copy
+ );
+
+ brw_bo_unmap(bo);
+ return true;
+}
+
+
static void
intelTexImage(struct gl_context * ctx,
GLuint dims,
@@ -183,6 +346,52 @@ intelTexImage(struct gl_context * ctx,
}
+static void
+intelTexSubImage(struct gl_context * ctx,
+ GLuint dims,
+ struct gl_texture_image *texImage,
+ GLint xoffset, GLint yoffset, GLint zoffset,
+ GLsizei width, GLsizei height, GLsizei depth,
+ GLenum format, GLenum type,
+ const GLvoid * pixels,
+ const struct gl_pixelstore_attrib *packing)
+{
+ struct intel_mipmap_tree *mt = intel_texture_image(texImage)->mt;
+ bool ok;
+
+ bool tex_busy = mt && brw_bo_busy(mt->bo);
+
+ if (mt && mt->format == MESA_FORMAT_S_UINT8)
+ mt->r8stencil_needs_update = true;
+
+ DBG("%s mesa_format %s target %s format %s type %s level %d %dx%dx%d\n",
+ __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);
+
+ ok = _mesa_meta_pbo_TexSubImage(ctx, dims, texImage,
+ xoffset, yoffset, zoffset,
+ width, height, depth, format, type,
+ pixels, tex_busy, packing);
+ if (ok)
+ return;
+
+ ok = intel_texsubimage_tiled_memcpy(ctx, dims, texImage,
+ xoffset, yoffset, zoffset,
+ width, height, depth,
+ format, type, pixels, packing,
+ false /*for_glTexImage*/);
+ if (ok)
+ return;
+
+ _mesa_store_texsubimage(ctx, dims, texImage,
+ xoffset, yoffset, zoffset,
+ width, height, depth,
+ format, type, pixels, packing);
+}
+
+
static void
intel_set_texture_image_mt(struct brw_context *brw,
struct gl_texture_image *image,
@@ -636,6 +845,7 @@ void
intelInitTextureImageFuncs(struct dd_function_table *functions)
{
functions->TexImage = intelTexImage;
+ functions->TexSubImage = intelTexSubImage;
functions->CompressedTexSubImage = intelCompressedTexSubImage;
functions->EGLImageTargetTexture2D = intel_image_target_texture_2d;
functions->BindRenderbufferTexImage = intel_bind_renderbuffer_tex_image;
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
deleted file mode 100644
index 8ccbf4f6450..00000000000
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2003 VMware, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "main/bufferobj.h"
-#include "main/image.h"
-#include "main/macros.h"
-#include "main/mtypes.h"
-#include "main/pbo.h"
-#include "main/texobj.h"
-#include "main/texstore.h"
-#include "main/texcompress.h"
-#include "main/enums.h"
-#include "drivers/common/meta.h"
-
-#include "brw_context.h"
-#include "intel_batchbuffer.h"
-#include "intel_tex.h"
-#include "intel_mipmap_tree.h"
-#include "intel_blit.h"
-#include "intel_tiled_memcpy.h"
-
-#define FILE_DEBUG_FLAG DEBUG_TEXTURE
-
-/**
- * \brief A fast path for glTexImage and glTexSubImage.
- *
- * \param for_glTexImage Was this called from glTexImage or glTexSubImage?
- *
- * This fast path is taken when the texture format is BGRA, RGBA,
- * A or L and when the texture memory is X- or Y-tiled. It uploads
- * the texture data by mapping the texture memory without a GTT fence, thus
- * acquiring a tiled view of the memory, and then copying sucessive
- * spans within each tile.
- *
- * This is a performance win over the conventional texture upload path because
- * it avoids the performance penalty of writing through the write-combine
- * buffer. In the conventional texture upload path,
- * texstore.c:store_texsubimage(), the texture memory is mapped through a GTT
- * fence, thus acquiring a linear view of the memory, then each row in the
- * image is memcpy'd. In this fast path, we replace each row's copy with
- * a sequence of copies over each linear span in tile.
- *
- * One use case is Google Chrome's paint rectangles. Chrome (as
- * of version 21) renders each page as a tiling of 256x256 GL_BGRA textures.
- * Each page's content is initially uploaded with glTexImage2D and damaged
- * regions are updated with glTexSubImage2D. On some workloads, the
- * performance gain of this fastpath on Sandybridge is over 5x.
- */
-bool
-intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
- GLuint dims,
- struct gl_texture_image *texImage,
- GLint xoffset, GLint yoffset, GLint zoffset,
- GLsizei width, GLsizei height, GLsizei depth,
- GLenum format, GLenum type,
- const GLvoid *pixels,
- const struct gl_pixelstore_attrib *packing,
- bool for_glTexImage)
-{
- struct brw_context *brw = brw_context(ctx);
- const struct gen_device_info *devinfo = &brw->screen->devinfo;
- struct intel_texture_image *image = intel_texture_image(texImage);
- int src_pitch;
-
- /* The miptree's buffer. */
- struct brw_bo *bo;
-
- uint32_t cpp;
- mem_copy_fn mem_copy = NULL;
-
- /* This fastpath is restricted to specific texture types:
- * a 2D BGRA, RGBA, L8 or A8 texture. It could be generalized to support
- * more types.
- *
- * FINISHME: The restrictions below on packing alignment and packing row
- * length are likely unneeded now because we calculate the source stride
- * with _mesa_image_row_stride. However, before removing the restrictions
- * we need tests.
- */
- if (!devinfo->has_llc ||
- !(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
- !(texImage->TexObject->Target == GL_TEXTURE_2D ||
- texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||
- pixels == NULL ||
- _mesa_is_bufferobj(packing->BufferObj) ||
- packing->Alignment > 4 ||
- packing->SkipPixels > 0 ||
- packing->SkipRows > 0 ||
- (packing->RowLength != 0 && packing->RowLength != width) ||
- packing->SwapBytes ||
- packing->LsbFirst ||
- packing->Invert)
- return false;
-
- /* Only a simple blit, no scale, bias or other mapping. */
- if (ctx->_ImageTransferState)
- return false;
-
- if (!intel_get_memcpy(texImage->TexFormat, format, type, &mem_copy, &cpp))
- return false;
-
- /* If this is a nontrivial texture view, let another path handle it instead. */
- if (texImage->TexObject->MinLayer)
- return false;
-
- if (for_glTexImage)
- ctx->Driver.AllocTextureImageBuffer(ctx, texImage);
-
- if (!image->mt ||
- (image->mt->surf.tiling != ISL_TILING_X &&
- image->mt->surf.tiling != ISL_TILING_Y0)) {
- /* The algorithm is written only for X- or Y-tiled memory. */
- return false;
- }
-
- /* linear_to_tiled() assumes that if the object is swizzled, it is using
- * I915_BIT6_SWIZZLE_9_10 for X and I915_BIT6_SWIZZLE_9 for Y. This is only
- * true on gen5 and above.
- *
- * The killer on top is that some gen4 have an L-shaped swizzle mode, where
- * parts of the memory aren't swizzled at all. Userspace just can't handle
- * that.
- */
- if (devinfo->gen < 5 && brw->has_swizzling)
- return false;
-
- int level = texImage->Level + texImage->TexObject->MinLevel;
-
- /* Since we are going to write raw data to the miptree, we need to resolve
- * any pending fast color clears before we start.
- */
- assert(image->mt->surf.logical_level0_px.depth == 1);
- assert(image->mt->surf.logical_level0_px.array_len == 1);
-
- intel_miptree_access_raw(brw, image->mt, level, 0, true);
-
- bo = image->mt->bo;
-
- if (brw_batch_references(&brw->batch, bo)) {
- perf_debug("Flushing before mapping a referenced bo.\n");
- intel_batchbuffer_flush(brw);
- }
-
- void *map = brw_bo_map(brw, bo, MAP_WRITE | MAP_RAW);
- if (map == NULL) {
- DBG("%s: failed to map bo\n", __func__);
- return false;
- }
-
- src_pitch = _mesa_image_row_stride(packing, width, format, type);
-
- /* We postponed printing this message until having committed to executing
- * the function.
- */
- DBG("%s: level=%d offset=(%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) "
- "for_glTexImage=%d\n",
- __func__, texImage->Level, xoffset, yoffset, width, height,
- format, type, texImage->TexFormat, image->mt->surf.tiling,
- packing->Alignment, packing->RowLength, packing->SkipPixels,
- packing->SkipRows, for_glTexImage);
-
- /* Adjust x and y offset based on miplevel */
- unsigned level_x, level_y;
- intel_miptree_get_image_offset(image->mt, level, 0, &level_x, &level_y);
- xoffset += level_x;
- yoffset += level_y;
-
- linear_to_tiled(
- xoffset * cpp, (xoffset + width) * cpp,
- yoffset, yoffset + height,
- map,
- pixels - (ptrdiff_t) yoffset * src_pitch - (ptrdiff_t) xoffset * cpp,
- image->mt->surf.row_pitch, src_pitch,
- brw->has_swizzling,
- image->mt->surf.tiling,
- mem_copy
- );
-
- brw_bo_unmap(bo);
- return true;
-}
-
-static void
-intelTexSubImage(struct gl_context * ctx,
- GLuint dims,
- struct gl_texture_image *texImage,
- GLint xoffset, GLint yoffset, GLint zoffset,
- GLsizei width, GLsizei height, GLsizei depth,
- GLenum format, GLenum type,
- const GLvoid * pixels,
- const struct gl_pixelstore_attrib *packing)
-{
- struct intel_mipmap_tree *mt = intel_texture_image(texImage)->mt;
- bool ok;
-
- bool tex_busy = mt && brw_bo_busy(mt->bo);
-
- if (mt && mt->format == MESA_FORMAT_S_UINT8)
- mt->r8stencil_needs_update = true;
-
- DBG("%s mesa_format %s target %s format %s type %s level %d %dx%dx%d\n",
- __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);
-
- ok = _mesa_meta_pbo_TexSubImage(ctx, dims, texImage,
- xoffset, yoffset, zoffset,
- width, height, depth, format, type,
- pixels, tex_busy, packing);
- if (ok)
- return;
-
- ok = intel_texsubimage_tiled_memcpy(ctx, dims, texImage,
- xoffset, yoffset, zoffset,
- width, height, depth,
- format, type, pixels, packing,
- false /*for_glTexImage*/);
- if (ok)
- return;
-
- _mesa_store_texsubimage(ctx, dims, texImage,
- xoffset, yoffset, zoffset,
- width, height, depth,
- format, type, pixels, packing);
-}
-
-void
-intelInitTextureSubImageFuncs(struct dd_function_table *functions)
-{
- functions->TexSubImage = intelTexSubImage;
-}
--
2.14.1
More information about the mesa-dev
mailing list