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

i915g: Fix bad naming of depth texture formats.

Browse source 
Now matches classic's i915_reg.h and the spec.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11559>
This commit is contained in:
Emma Anholt 2021-06-22 16:11:51 -07:00 • committed by Marge Bot
parent 078030973b
commit 2683c7bf9a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/i915/i915_reg.h
View file

@ -750,8 +750,8 @@
#define MT_32BIT_GR1616 (0xB<<3)
#define MT_32BIT_VU1616 (0xC<<3)
#define MT_32BIT_xI824 (0xD<<3)
#define MT_32BIT_xA824 (0xE<<3)
#define MT_32BIT_xL824 (0xF<<3)
#define MT_32BIT_xL824 (0xE<<3)
#define MT_32BIT_xA824 (0xF<<3)
#define MT_422_YCRCB_SWAPY (0<<3) /* SURFACE_422 */
#define MT_422_YCRCB_NORMAL (1<<3)
#define MT_422_YCRCB_SWAPUV (2<<3)

4
src/gallium/drivers/i915/i915_state_sampler.c
View file

@ -252,7 +252,7 @@ static uint translate_texture_format(enum pipe_format pipeFormat,
view->swizzle_g == PIPE_SWIZZLE_X &&
view->swizzle_b == PIPE_SWIZZLE_X &&
view->swizzle_a == PIPE_SWIZZLE_1)
return (MAPSURF_32BIT | MT_32BIT_xA824);
return (MAPSURF_32BIT | MT_32BIT_xL824);
if ( view->swizzle_r == PIPE_SWIZZLE_X &&
view->swizzle_g == PIPE_SWIZZLE_X &&
view->swizzle_b == PIPE_SWIZZLE_X &&
@ -262,7 +262,7 @@ static uint translate_texture_format(enum pipe_format pipeFormat,
view->swizzle_g == PIPE_SWIZZLE_0 &&
view->swizzle_b == PIPE_SWIZZLE_0 &&
view->swizzle_a == PIPE_SWIZZLE_X)
return (MAPSURF_32BIT | MT_32BIT_xL824);
return (MAPSURF_32BIT | MT_32BIT_xA824);
debug_printf("i915: unsupported depth swizzle %d %d %d %d\n",
view->swizzle_r,
view->swizzle_g,