fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 06:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svga: Fix zslice index to svga_texture_copy_handle_resource()

Browse source 
The zslice index to svga_texture_copy_handle_resource() is not adjusted
and should be a signed integer.

This patch fixes piglit tests for non-vgpu10 including
   spec@arb_framebuffer_object@fbo-generatemipmap-3d
   spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture* 3d

Tested with MTT piglit and glretrace
This commit is contained in:
Charmaine Lee 2017-04-04 13:14:54 -06:00 • committed by Brian Paul
parent 5637a497a3
commit 35a748e79c
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/svga/svga_surface.c
View file

@ -111,18 +111,25 @@ svga_texture_copy_handle_resource(struct svga_context *svga,
struct svga_winsys_surface *dst, struct svga_winsys_surface *dst,
unsigned int numMipLevels, unsigned int numMipLevels,
unsigned int numLayers, unsigned int numLayers,
unsigned int zoffset, int zslice_pick,
unsigned int mipoffset, unsigned int mipoffset,
unsigned int layeroffset) unsigned int layeroffset)
{ {
unsigned int i, j; unsigned int i, j;
unsigned int zoffset = 0;
/* A negative zslice_pick implies zoffset at 0, and depth to copy is
* from the depth of the texture at the particular mipmap level.
*/
if (zslice_pick >= 0)
zoffset = zslice_pick;
for (i = 0; i < numMipLevels; i++) { for (i = 0; i < numMipLevels; i++) {
unsigned int miplevel = i + mipoffset; unsigned int miplevel = i + mipoffset;
for (j = 0; j < numLayers; j++) { for (j = 0; j < numLayers; j++) {
if (svga_is_texture_level_defined(src_tex, j+layeroffset, miplevel)) { if (svga_is_texture_level_defined(src_tex, j+layeroffset, miplevel)) {
unsigned depth = (zoffset < 0 ? unsigned depth = (zslice_pick < 0 ?
u_minify(src_tex->b.b.depth0, miplevel) : 1); u_minify(src_tex->b.b.depth0, miplevel) : 1);
svga_texture_copy_handle(svga, svga_texture_copy_handle(svga,
@ -155,7 +162,6 @@ svga_texture_view_surface(struct svga_context *svga,
{ {
struct svga_screen *ss = svga_screen(svga->pipe.screen); struct svga_screen *ss = svga_screen(svga->pipe.screen);
struct svga_winsys_surface *handle; struct svga_winsys_surface *handle;
unsigned z_offset = 0;
boolean validated; boolean validated;
SVGA_DBG(DEBUG_PERF, SVGA_DBG(DEBUG_PERF,
@ -205,13 +211,10 @@ svga_texture_view_surface(struct svga_context *svga,
if (layer_pick < 0) if (layer_pick < 0)
layer_pick = 0; layer_pick = 0;
if (zslice_pick >= 0)
z_offset = zslice_pick;
svga_texture_copy_handle_resource(svga, tex, handle, svga_texture_copy_handle_resource(svga, tex, handle,
key->numMipLevels, key->numMipLevels,
key->numFaces * key->arraySize, key->numFaces * key->arraySize,
z_offset, start_mip, layer_pick); zslice_pick, start_mip, layer_pick);
return handle; return handle;
} }