[Mesa-dev] [PATCH 20/22] no-meta-pbo-teximage
Chris Wilson
chris at chris-wilson.co.uk
Sat Aug 5 09:40:12 UTC 2017
---
src/mesa/Makefile.sources | 1 -
src/mesa/drivers/common/meta.h | 17 -
src/mesa/drivers/common/meta_tex_subimage.c | 495 ----------------------------
3 files changed, 513 deletions(-)
delete mode 100644 src/mesa/drivers/common/meta_tex_subimage.c
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index 97c8287acb..76b59d3430 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -632,7 +632,6 @@ COMMON_DRIVER_FILES = \
drivers/common/driverfuncs.h \
drivers/common/meta_blit.c \
drivers/common/meta_generate_mipmap.c \
- drivers/common/meta_tex_subimage.c \
drivers/common/meta.c \
drivers/common/meta.h
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
index 1b5cf42eb8..af2399642f 100644
--- a/src/mesa/drivers/common/meta.h
+++ b/src/mesa/drivers/common/meta.h
@@ -520,23 +520,6 @@ extern void
_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj);
-extern bool
-_mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims,
- struct gl_texture_image *tex_image,
- int xoffset, int yoffset, int zoffset,
- int width, int height, int depth,
- GLenum format, GLenum type, const void *pixels,
- bool create_pbo,
- const struct gl_pixelstore_attrib *packing);
-
-extern bool
-_mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims,
- struct gl_texture_image *tex_image,
- int xoffset, int yoffset, int zoffset,
- int width, int height, int depth,
- GLenum format, GLenum type, const void *pixels,
- const struct gl_pixelstore_attrib *packing);
-
extern void
_mesa_meta_CopyTexSubImage(struct gl_context *ctx, GLuint dims,
struct gl_texture_image *texImage,
diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c
deleted file mode 100644
index e0284a3f07..0000000000
--- a/src/mesa/drivers/common/meta_tex_subimage.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2015 Intel Corporation. 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 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
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- * Jason Ekstrand <jason.ekstrand at intel.com>
- */
-
-#include "blend.h"
-#include "bufferobj.h"
-#include "buffers.h"
-#include "clear.h"
-#include "fbobject.h"
-#include "framebuffer.h"
-#include "glformats.h"
-#include "glheader.h"
-#include "image.h"
-#include "macros.h"
-#include "meta.h"
-#include "pbo.h"
-#include "readpix.h"
-#include "shaderapi.h"
-#include "state.h"
-#include "teximage.h"
-#include "texobj.h"
-#include "texstate.h"
-#include "uniforms.h"
-#include "varray.h"
-
-static bool
-need_signed_unsigned_int_conversion(mesa_format mesaFormat,
- GLenum format, GLenum type)
-{
- const GLenum mesaFormatType = _mesa_get_format_datatype(mesaFormat);
- const bool is_format_integer = _mesa_is_enum_format_integer(format);
- return (mesaFormatType == GL_INT &&
- is_format_integer &&
- (type == GL_UNSIGNED_INT ||
- type == GL_UNSIGNED_SHORT ||
- type == GL_UNSIGNED_BYTE)) ||
- (mesaFormatType == GL_UNSIGNED_INT &&
- is_format_integer &&
- (type == GL_INT ||
- type == GL_SHORT ||
- type == GL_BYTE));
-}
-
-static struct gl_texture_image *
-create_texture_for_pbo(struct gl_context *ctx,
- bool create_pbo, GLenum pbo_target,
- int dims, int width, int height, int depth,
- GLenum format, GLenum type, const void *pixels,
- const struct gl_pixelstore_attrib *packing,
- struct gl_buffer_object **tmp_pbo, GLuint *tmp_tex)
-{
- const mesa_format pbo_format =
- _mesa_tex_format_from_format_and_type(ctx, format, type);
- GLenum internal_format;
- unsigned row_stride;
- struct gl_buffer_object *buffer_obj;
- struct gl_texture_object *tex_obj;
- struct gl_texture_image *tex_image;
- bool read_only;
-
- if (packing->SwapBytes ||
- packing->LsbFirst ||
- packing->Invert)
- return NULL;
-
- if (pbo_format == MESA_FORMAT_NONE)
- return NULL;
-
- /* Account for SKIP_PIXELS, SKIP_ROWS, ALIGNMENT, and SKIP_IMAGES */
- uint32_t first_pixel = _mesa_image_offset(dims, packing, width, height,
- format, type,
- 0, 0, 0);
- uint32_t last_pixel = _mesa_image_offset(dims, packing, width, height,
- format, type,
- depth-1, height-1, width);
- row_stride = _mesa_image_row_stride(packing, width, format, type);
-
- if (_mesa_is_bufferobj(packing->BufferObj)) {
- *tmp_pbo = NULL;
- buffer_obj = packing->BufferObj;
- first_pixel += (intptr_t)pixels;
- } else {
- bool is_pixel_pack = pbo_target == GL_PIXEL_PACK_BUFFER;
-
- assert(create_pbo);
-
- *tmp_pbo = ctx->Driver.NewBufferObject(ctx, 0xDEADBEEF);
- if (*tmp_pbo == NULL)
- return NULL;
-
- /* In case of GL_PIXEL_PACK_BUFFER, pass null pointer for the pixel
- * data to avoid unnecessary data copying in _mesa_buffer_data.
- */
- if (is_pixel_pack)
- _mesa_buffer_data(ctx, *tmp_pbo, GL_NONE,
- last_pixel - first_pixel,
- NULL,
- GL_STREAM_READ,
- __func__);
- else
- _mesa_buffer_data(ctx, *tmp_pbo, GL_NONE,
- last_pixel - first_pixel,
- (char *)pixels + first_pixel,
- GL_STREAM_DRAW,
- __func__);
-
- buffer_obj = *tmp_pbo;
- first_pixel = 0;
- }
-
- _mesa_GenTextures(1, tmp_tex);
- tex_obj = _mesa_lookup_texture(ctx, *tmp_tex);
- _mesa_initialize_texture_object(ctx, tex_obj, *tmp_tex, GL_TEXTURE_2D);
- /* This must be set after _mesa_initialize_texture_object, not before. */
- tex_obj->Immutable = GL_TRUE;
- tex_obj->ImmutableLevels = 1;
- /* This is required for interactions with ARB_texture_view. */
- tex_obj->NumLayers = 1;
-
- internal_format = _mesa_get_format_base_format(pbo_format);
-
- /* The texture is addressed as a single very-tall image, so we
- * need to pack the multiple image depths together taking the
- * inter-image padding into account.
- */
- int image_height = packing->ImageHeight == 0 ? height : packing->ImageHeight;
- int full_height = image_height * (depth - 1) + height;
-
- tex_image = _mesa_get_tex_image(ctx, tex_obj, tex_obj->Target, 0);
- _mesa_init_teximage_fields(ctx, tex_image, width, full_height, 1,
- 0, internal_format, pbo_format);
-
- read_only = pbo_target == GL_PIXEL_UNPACK_BUFFER;
- if (!ctx->Driver.SetTextureStorageForBufferObject(ctx, tex_obj,
- buffer_obj,
- first_pixel,
- row_stride,
- read_only)) {
- _mesa_DeleteTextures(1, tmp_tex);
- _mesa_reference_buffer_object(ctx, tmp_pbo, NULL);
- return NULL;
- }
-
- return tex_image;
-}
-
-bool
-_mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims,
- struct gl_texture_image *tex_image,
- int xoffset, int yoffset, int zoffset,
- int width, int height, int depth,
- GLenum format, GLenum type, const void *pixels,
- bool create_pbo,
- const struct gl_pixelstore_attrib *packing)
-{
- struct gl_buffer_object *pbo = NULL;
- GLuint pbo_tex = 0;
- struct gl_framebuffer *readFb = NULL;
- struct gl_framebuffer *drawFb = NULL;
- int image_height;
- struct gl_texture_image *pbo_tex_image;
- GLenum status;
- bool success = false;
- int z;
-
- if (!_mesa_is_bufferobj(packing->BufferObj) &&
- (!create_pbo || pixels == NULL))
- return false;
-
- if (format == GL_DEPTH_COMPONENT ||
- format == GL_DEPTH_STENCIL ||
- format == GL_STENCIL_INDEX ||
- format == GL_COLOR_INDEX)
- return false;
-
- if (ctx->_ImageTransferState)
- return false;
-
- /* This function rely on BlitFramebuffer to fill in the pixel data for
- * glTex[Sub]Image*D. But, BlitFrameBuffer doesn't support signed to
- * unsigned or unsigned to signed integer conversions.
- */
- if (need_signed_unsigned_int_conversion(tex_image->TexFormat, format, type))
- return false;
-
- /* For arrays, use a tall (height * depth) 2D texture but taking into
- * account the inter-image padding specified with the image height packing
- * property.
- */
- image_height = packing->ImageHeight == 0 ? height : packing->ImageHeight;
-
- _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER |
- MESA_META_PIXEL_STORE));
-
- pbo_tex_image = create_texture_for_pbo(ctx, create_pbo,
- GL_PIXEL_UNPACK_BUFFER,
- dims, width, height, depth,
- format, type, pixels, packing,
- &pbo, &pbo_tex);
- if (!pbo_tex_image) {
- _mesa_meta_end(ctx);
- return false;
- }
-
- readFb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF);
- if (readFb == NULL)
- goto fail;
-
- drawFb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF);
- if (drawFb == NULL)
- goto fail;
-
- _mesa_bind_framebuffers(ctx, drawFb, readFb);
-
- if (tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) {
- assert(depth == 1);
- assert(zoffset == 0);
- depth = height;
- height = 1;
- image_height = 1;
- zoffset = yoffset;
- yoffset = 0;
- }
-
- _mesa_meta_framebuffer_texture_image(ctx, ctx->ReadBuffer,
- GL_COLOR_ATTACHMENT0,
- pbo_tex_image, 0);
- /* If this passes on the first layer it should pass on the others */
- status = _mesa_check_framebuffer_status(ctx, ctx->ReadBuffer);
- if (status != GL_FRAMEBUFFER_COMPLETE)
- goto fail;
-
- _mesa_meta_framebuffer_texture_image(ctx, ctx->DrawBuffer,
- GL_COLOR_ATTACHMENT0,
- tex_image, zoffset);
- /* If this passes on the first layer it should pass on the others */
- status = _mesa_check_framebuffer_status(ctx, ctx->DrawBuffer);
- if (status != GL_FRAMEBUFFER_COMPLETE)
- goto fail;
-
- /* Explicitly disable sRGB encoding */
- ctx->DrawBuffer->Visual.sRGBCapable = false;
-
- _mesa_update_state(ctx);
-
- if (_mesa_meta_BlitFramebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
- 0, 0, width, height,
- xoffset, yoffset,
- xoffset + width, yoffset + height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST))
- goto fail;
-
- for (z = 1; z < depth; z++) {
- _mesa_meta_framebuffer_texture_image(ctx, ctx->DrawBuffer,
- GL_COLOR_ATTACHMENT0,
- tex_image, zoffset + z);
-
- _mesa_update_state(ctx);
-
- _mesa_meta_BlitFramebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
- 0, z * image_height,
- width, z * image_height + height,
- xoffset, yoffset,
- xoffset + width, yoffset + height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST);
- }
-
- success = true;
-
-fail:
- _mesa_reference_framebuffer(&readFb, NULL);
- _mesa_reference_framebuffer(&drawFb, NULL);
- _mesa_DeleteTextures(1, &pbo_tex);
- _mesa_reference_buffer_object(ctx, &pbo, NULL);
-
- _mesa_meta_end(ctx);
-
- return success;
-}
-
-bool
-_mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims,
- struct gl_texture_image *tex_image,
- int xoffset, int yoffset, int zoffset,
- int width, int height, int depth,
- GLenum format, GLenum type, const void *pixels,
- const struct gl_pixelstore_attrib *packing)
-{
- struct gl_buffer_object *pbo = NULL;
- GLuint pbo_tex = 0;
- struct gl_framebuffer *readFb;
- struct gl_framebuffer *drawFb;
- int image_height;
- struct gl_texture_image *pbo_tex_image;
- struct gl_renderbuffer *rb = NULL;
- GLenum dstBaseFormat = _mesa_unpack_format_to_base_format(format);
- GLenum status, src_base_format;
- bool success = false, clear_channels_to_zero = false;
- float save_clear_color[4];
- int z;
-
- if (!_mesa_is_bufferobj(packing->BufferObj))
- return false;
-
- if (format == GL_DEPTH_COMPONENT ||
- format == GL_DEPTH_STENCIL ||
- format == GL_STENCIL_INDEX ||
- format == GL_COLOR_INDEX)
- return false;
-
- /* Don't use meta path for readpixels in below conditions. */
- if (!tex_image) {
- rb = ctx->ReadBuffer->_ColorReadBuffer;
-
- /* _mesa_get_readpixels_transfer_ops() includes the cases of read
- * color clamping along with the ctx->_ImageTransferState.
- */
- if (_mesa_get_readpixels_transfer_ops(ctx, rb->Format, format,
- type, GL_FALSE))
- return false;
-
- if (_mesa_need_rgb_to_luminance_conversion(rb->_BaseFormat,
- dstBaseFormat))
- return false;
-
- /* This function rely on BlitFramebuffer to fill in the pixel data for
- * ReadPixels. But, BlitFrameBuffer doesn't support signed to unsigned
- * or unsigned to signed integer conversions. OpenGL spec expects an
- * invalid operation in that case.
- */
- if (need_signed_unsigned_int_conversion(rb->Format, format, type))
- return false;
- } else {
- if (need_signed_unsigned_int_conversion(tex_image->TexFormat, format, type))
- return false;
- }
-
- /* For arrays, use a tall (height * depth) 2D texture but taking into
- * account the inter-image padding specified with the image height packing
- * property.
- */
- image_height = packing->ImageHeight == 0 ? height : packing->ImageHeight;
-
- _mesa_meta_begin(ctx, ~(MESA_META_PIXEL_TRANSFER |
- MESA_META_PIXEL_STORE));
-
- pbo_tex_image = create_texture_for_pbo(ctx, false, GL_PIXEL_PACK_BUFFER,
- dims, width, height, depth,
- format, type, pixels, packing,
- &pbo, &pbo_tex);
-
- if (!pbo_tex_image) {
- _mesa_meta_end(ctx);
- return false;
- }
-
- /* GL_CLAMP_FRAGMENT_COLOR doesn't affect ReadPixels and GettexImage */
- if (ctx->Extensions.ARB_color_buffer_float)
- _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
-
- readFb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF);
- if (readFb == NULL)
- goto fail;
-
- drawFb = ctx->Driver.NewFramebuffer(ctx, 0xDEADBEEF);
- if (drawFb == NULL)
- goto fail;
-
- if (tex_image && tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) {
- assert(depth == 1);
- assert(zoffset == 0);
- depth = height;
- height = 1;
- image_height = 1;
- zoffset = yoffset;
- yoffset = 0;
- }
-
- /* If we were given a texture, bind it to the read framebuffer. If not,
- * we're doing a ReadPixels and we should just use whatever framebuffer
- * the client has bound.
- */
- _mesa_bind_framebuffers(ctx, drawFb, tex_image ? readFb : ctx->ReadBuffer);
- if (tex_image) {
- _mesa_meta_framebuffer_texture_image(ctx, ctx->ReadBuffer,
- GL_COLOR_ATTACHMENT0,
- tex_image, zoffset);
- /* If this passes on the first layer it should pass on the others */
- status = _mesa_check_framebuffer_status(ctx, ctx->ReadBuffer);
- if (status != GL_FRAMEBUFFER_COMPLETE)
- goto fail;
- } else {
- assert(depth == 1);
- }
-
- _mesa_meta_framebuffer_texture_image(ctx, ctx->DrawBuffer,
- GL_COLOR_ATTACHMENT0,
- pbo_tex_image, 0);
- /* If this passes on the first layer it should pass on the others */
- status = _mesa_check_framebuffer_status(ctx, ctx->DrawBuffer);
- if (status != GL_FRAMEBUFFER_COMPLETE)
- goto fail;
-
- /* Explicitly disable sRGB encoding */
- ctx->DrawBuffer->Visual.sRGBCapable = false;
-
- _mesa_update_state(ctx);
-
- if (_mesa_meta_BlitFramebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
- xoffset, yoffset,
- xoffset + width, yoffset + height,
- 0, 0, width, height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST))
- goto fail;
-
- src_base_format = tex_image ?
- tex_image->_BaseFormat :
- ctx->ReadBuffer->_ColorReadBuffer->_BaseFormat;
-
- /* Depending on the base formats involved we might need to rebase some
- * values. For example if we download from a Luminance format to RGBA
- * format, we want G=0 and B=0.
- */
- clear_channels_to_zero =
- _mesa_need_luminance_to_rgb_conversion(src_base_format,
- pbo_tex_image->_BaseFormat);
-
- if (clear_channels_to_zero) {
- memcpy(save_clear_color, ctx->Color.ClearColor.f, 4 * sizeof(float));
- /* Clear the Green, Blue channels. */
- _mesa_ColorMask(GL_FALSE, GL_TRUE, GL_TRUE,
- src_base_format != GL_LUMINANCE_ALPHA);
- _mesa_ClearColor(0.0, 0.0, 0.0, 1.0);
- _mesa_Clear(GL_COLOR_BUFFER_BIT);
- }
-
- for (z = 1; z < depth; z++) {
- _mesa_meta_framebuffer_texture_image(ctx, ctx->ReadBuffer,
- GL_COLOR_ATTACHMENT0,
- tex_image, zoffset + z);
-
- _mesa_update_state(ctx);
-
- _mesa_meta_BlitFramebuffer(ctx, ctx->ReadBuffer, ctx->DrawBuffer,
- xoffset, yoffset,
- xoffset + width, yoffset + height,
- 0, z * image_height,
- width, z * image_height + height,
- GL_COLOR_BUFFER_BIT, GL_NEAREST);
- if (clear_channels_to_zero)
- _mesa_Clear(GL_COLOR_BUFFER_BIT);
- }
-
- /* Unmask the color channels and restore the saved clear color values. */
- if (clear_channels_to_zero) {
- _mesa_ColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
- _mesa_ClearColor(save_clear_color[0], save_clear_color[1],
- save_clear_color[2], save_clear_color[3]);
- }
-
- success = true;
-
-fail:
- _mesa_reference_framebuffer(&drawFb, NULL);
- _mesa_reference_framebuffer(&readFb, NULL);
- _mesa_DeleteTextures(1, &pbo_tex);
- _mesa_reference_buffer_object(ctx, &pbo, NULL);
-
- _mesa_meta_end(ctx);
-
- return success;
-}
--
2.13.3
More information about the mesa-dev
mailing list