From f73c63a17558263eb0bc885bfbc61048c7b9d8eb Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 2 Jun 2017 19:08:15 -0700 Subject: i915: On Gen <= 3 there are no array textures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Romanick Reviewed-by: Ville Syrjälä --- src/mesa/drivers/dri/i915/intel_mipmap_tree.c | 5 ----- src/mesa/drivers/dri/i915/intel_mipmap_tree.h | 2 -- src/mesa/drivers/dri/i915/intel_tex.c | 4 ---- src/mesa/drivers/dri/i915/intel_tex_image.c | 6 ------ 4 files changed, 17 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c index bb6166e01ab..b0ebff593a2 100644 --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c @@ -395,11 +395,6 @@ intel_miptree_get_dimensions_for_image(struct gl_texture_image *image, int *width, int *height, int *depth) { switch (image->TexObject->Target) { - case GL_TEXTURE_1D_ARRAY: - *width = image->Width; - *height = 1; - *depth = image->Height; - break; default: *width = image->Width; *height = image->Height; diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h index b4a8968db30..2d11853389e 100644 --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h @@ -94,8 +94,6 @@ struct intel_mipmap_level * * The exact semantics of depth varies according to the texture target: * - For GL_TEXTURE_CUBE_MAP, depth is 6. - * - For GL_TEXTURE_2D_ARRAY, depth is the number of array slices. It is - * identical for all miplevels in the texture. * - For GL_TEXTURE_3D, it is the texture's depth at this miplevel. Its * value, like width and height, varies with miplevel. * - For other texture types, depth is 1. diff --git a/src/mesa/drivers/dri/i915/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index 4c48d3bd3eb..0b24c7e935b 100644 --- a/src/mesa/drivers/dri/i915/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c @@ -140,10 +140,6 @@ intel_map_texture_image(struct gl_context *ctx, /* Our texture data is always stored in a miptree. */ assert(mt); - /* Check that our caller wasn't confused about how to map a 1D texture. */ - assert(tex_image->TexObject->Target != GL_TEXTURE_1D_ARRAY || - h == 1); - /* intel_miptree_map operates on a unified "slice" number that references the * cube face, since it's all just slices to the miptree code. */ diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c index 63ef08b44a6..3308e377566 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_image.c +++ b/src/mesa/drivers/dri/i915/intel_tex_image.c @@ -141,12 +141,6 @@ try_pbo_upload(struct gl_context *ctx, return false; } - if (image->TexObject->Target == GL_TEXTURE_1D_ARRAY || - image->TexObject->Target == GL_TEXTURE_2D_ARRAY) { - DBG("%s: no support for array textures\n", __func__); - return false; - } - src_buffer = intel_bufferobj_source(intel, pbo, 64, &src_offset); /* note: potential 64-bit ptr to 32-bit int cast */ src_offset += (GLuint) (unsigned long) pixels; -- cgit v1.2.3