aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg Kristensen <[email protected]>2016-05-09 22:53:47 -0700
committerKristian Høgsberg Kristensen <[email protected]>2016-05-24 10:14:57 -0700
commit6eede8763121f6d197cf2fcf0d6c30d304cd065c (patch)
tree4a22db09da8361e694effbdef4b0cd69456a9622
parent8ceb7c7d9bc2443c84069a8441b97b8beea4f922 (diff)
i965: Refactor intel_set_texture_image_bo() to create_mt_for_dri_image()
This function now only creates the mt and we then call intel_set_texture_image_mt() in intel_image_target_texture_2d() to set it for the texture image. Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/intel_tex_image.c69
1 files changed, 30 insertions, 39 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 7d71aa2d648..4d20a8607fd 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -167,33 +167,30 @@ intel_set_texture_image_mt(struct brw_context *brw,
*
* Used for GLX_EXT_texture_from_pixmap and EGL image extensions,
*/
-static void
-intel_set_texture_image_bo(struct gl_context *ctx,
- struct gl_texture_image *image,
- drm_intel_bo *bo,
- GLenum target,
- GLenum internalFormat,
- mesa_format format,
- uint32_t offset,
- GLuint width, GLuint height,
- GLuint pitch,
- GLuint tile_x, GLuint tile_y,
- uint32_t layout_flags)
+static struct intel_mipmap_tree *
+create_mt_for_dri_image(struct brw_context *brw,
+ GLenum target, __DRIimage *image)
{
- struct brw_context *brw = brw_context(ctx);
- uint32_t draw_x, draw_y;
struct intel_mipmap_tree *mt;
+ uint32_t draw_x, draw_y;
- mt = intel_miptree_create_for_bo(brw, bo, image->TexFormat,
- 0, width, height, 1, pitch,
- layout_flags);
+ /* 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.
+ */
+ mt = intel_miptree_create_for_bo(brw, image->bo, image->format,
+ 0, image->width, image->height, 1,
+ image->pitch,
+ MIPTREE_LAYOUT_DISABLE_AUX);
if (mt == NULL)
- return;
+ return NULL;
+
mt->target = target;
- mt->total_width = width;
- mt->total_height = height;
- mt->level[0].slice[0].x_offset = tile_x;
- mt->level[0].slice[0].y_offset = tile_y;
+ mt->total_width = image->width;
+ mt->total_height = image->height;
+ mt->level[0].slice[0].x_offset = image->tile_x;
+ mt->level[0].slice[0].y_offset = image->tile_y;
intel_miptree_get_tile_offsets(mt, 0, 0, &draw_x, &draw_y);
@@ -203,15 +200,14 @@ intel_set_texture_image_bo(struct gl_context *ctx,
*/
if (!brw->has_surface_tile_offset &&
(draw_x != 0 || draw_y != 0)) {
- _mesa_error(ctx, GL_INVALID_OPERATION, __func__);
+ _mesa_error(&brw->ctx, GL_INVALID_OPERATION, __func__);
intel_miptree_release(&mt);
- return;
+ return NULL;
}
- mt->offset = offset;
+ mt->offset = image->offset;
- intel_set_texture_image_mt(brw, image, mt);
- intel_miptree_release(&mt);
+ return mt;
}
void
@@ -324,6 +320,7 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
GLeglImageOES image_handle)
{
struct brw_context *brw = brw_context(ctx);
+ struct intel_mipmap_tree *mt;
__DRIscreen *screen;
__DRIimage *image;
@@ -351,18 +348,12 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
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,
- MIPTREE_LAYOUT_DISABLE_AUX);
+ mt = create_mt_for_dri_image(brw, target, image);
+ if (mt == NULL)
+ return;
+
+ intel_set_texture_image_mt(brw, texImage, mt);
+ intel_miptree_release(&mt);
}
/**