OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svga: update a few surface format names

Browse Source 
To sync with in-house changes.

Reviewed-by: Neha Bhende <bhenden@vmware.com>
This commit is contained in:
Brian Paul
2017-06-28 16:43:52 -06:00
parent d3cbe8c5f3
commit 0782350b80
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/drivers/svga/include/svga3d_surfacedefs.h
View File

@@ -486,12 +486,12 @@ static const struct svga3d_surface_desc svga3d_surface_descs[] = {
64, {{0}, {8}, {32}, {0}},
{{0}, {32}, {0}, {0}}},
{SVGA3D_R32_FLOAT_X8X24_TYPELESS, SVGA3DBLOCKDESC_R_FP,
{SVGA3D_R32_FLOAT_X8X24, SVGA3DBLOCKDESC_R_FP,
{1, 1, 1}, 8, 8,
64, {{0}, {0}, {32}, {0}},
{{0}, {0}, {0}, {0}}},
{SVGA3D_X32_TYPELESS_G8X24_UINT, SVGA3DBLOCKDESC_GREEN,
{SVGA3D_X32_G8X24_UINT, SVGA3DBLOCKDESC_GREEN,
{1, 1, 1}, 8, 8,
64, {{0}, {8}, {0}, {0}},
{{0}, {32}, {0}, {0}}},
@@ -581,12 +581,12 @@ static const struct svga3d_surface_desc svga3d_surface_descs[] = {
32, {{0}, {8}, {24}, {0}},
{{0}, {24}, {0}, {0}}},
{SVGA3D_R24_UNORM_X8_TYPELESS, SVGA3DBLOCKDESC_RED,
{SVGA3D_R24_UNORM_X8, SVGA3DBLOCKDESC_RED,
{1, 1, 1}, 4, 4,
32, {{0}, {0}, {24}, {0}},
{{0}, {0}, {0}, {0}}},
{SVGA3D_X24_TYPELESS_G8_UINT, SVGA3DBLOCKDESC_GREEN,
{SVGA3D_X24_G8_UINT, SVGA3DBLOCKDESC_GREEN,
{1, 1, 1}, 4, 4,
32, {{0}, {8}, {0}, {0}},
{{0}, {24}, {0}, {0}}},

8
src/gallium/drivers/svga/include/svga3d_types.h
View File

@@ -204,8 +204,8 @@ typedef enum SVGA3dSurfaceFormat {
SVGA3D_R32G32_SINT = 59,
SVGA3D_R32G8X24_TYPELESS = 60,
SVGA3D_D32_FLOAT_S8X24_UINT = 61,
SVGA3D_R32_FLOAT_X8X24_TYPELESS = 62,
SVGA3D_X32_TYPELESS_G8X24_UINT = 63,
SVGA3D_R32_FLOAT_X8X24 = 62,
SVGA3D_X32_G8X24_UINT = 63,
SVGA3D_R10G10B10A2_TYPELESS = 64,
SVGA3D_R10G10B10A2_UINT = 65,
SVGA3D_R11G11B10_FLOAT = 66,
@@ -223,8 +223,8 @@ typedef enum SVGA3dSurfaceFormat {
SVGA3D_R32_SINT = 78,
SVGA3D_R24G8_TYPELESS = 79,
SVGA3D_D24_UNORM_S8_UINT = 80,
SVGA3D_R24_UNORM_X8_TYPELESS = 81,
SVGA3D_X24_TYPELESS_G8_UINT = 82,
SVGA3D_R24_UNORM_X8 = 81,
SVGA3D_X24_G8_UINT = 82,
SVGA3D_R8G8_TYPELESS = 83,
SVGA3D_R8G8_UNORM = 84,
SVGA3D_R8G8_UINT = 85,

32
src/gallium/drivers/svga/svga_format.c
View File

@@ -530,10 +530,10 @@ struct format_cap {
* avoid querying the host. In particular, depth/stencil formats which
* can be rendered to and sampled from. For example, the gallium format
* PIPE_FORMAT_Z24_UNORM_S8_UINT is converted to SVGA3D_D24_UNORM_S8_UINT
* for rendering but converted to SVGA3D_R24_UNORM_X8_TYPELESS for sampling.
* for rendering but converted to SVGA3D_R24_UNORM_X8 for sampling.
* If we want to query if a format supports both rendering and sampling the
* host will tell us no for SVGA3D_D24_UNORM_S8_UINT, SVGA3D_D16_UNORM and
* SVGA3D_R24_UNORM_X8_TYPELESS. So we override the host query for those
* SVGA3D_R24_UNORM_X8. So we override the host query for those
* formats and report that both can do rendering and sampling.
*/
static const struct format_cap format_cap_table[] = {
@@ -1026,8 +1026,8 @@ static const struct format_cap format_cap_table[] = {
{
/* Special case: no devcap / report sampler and depth/stencil ability
*/
"SVGA3D_R32_FLOAT_X8X24_TYPELESS",
SVGA3D_R32_FLOAT_X8X24_TYPELESS,
"SVGA3D_R32_FLOAT_X8X24",
SVGA3D_R32_FLOAT_X8X24,
0, /*SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24_TYPELESS*/
1, 1, 8,
SVGA3DFORMAT_OP_TEXTURE |
@@ -1036,8 +1036,8 @@ static const struct format_cap format_cap_table[] = {
SVGA3DFORMAT_OP_ZSTENCIL
},
{
"SVGA3D_X32_TYPELESS_G8X24_UINT",
SVGA3D_X32_TYPELESS_G8X24_UINT,
"SVGA3D_X32_G8X24_UINT",
SVGA3D_X32_G8X24_UINT,
SVGA3D_DEVCAP_DXFMT_X32_TYPELESS_G8X24_UINT,
1, 1, 4, 0
},
@@ -1158,8 +1158,8 @@ static const struct format_cap format_cap_table[] = {
{
/* Special case: no devcap / report sampler and depth/stencil ability
*/
"SVGA3D_R24_UNORM_X8_TYPELESS",
SVGA3D_R24_UNORM_X8_TYPELESS,
"SVGA3D_R24_UNORM_X8",
SVGA3D_R24_UNORM_X8,
0, /*SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8_TYPELESS*/
1, 1, 4,
SVGA3DFORMAT_OP_TEXTURE |
@@ -1168,8 +1168,8 @@ static const struct format_cap format_cap_table[] = {
SVGA3DFORMAT_OP_ZSTENCIL
},
{
"SVGA3D_X24_TYPELESS_G8_UINT",
SVGA3D_X24_TYPELESS_G8_UINT,
"SVGA3D_X24_G8_UINT",
SVGA3D_X24_G8_UINT,
SVGA3D_DEVCAP_DXFMT_X24_TYPELESS_G8_UINT,
1, 1, 4, 0
},
@@ -1827,8 +1827,8 @@ svga_typeless_format(SVGA3dSurfaceFormat format)
return SVGA3D_R32G32_TYPELESS;
case SVGA3D_D32_FLOAT_S8X24_UINT:
return SVGA3D_R32G8X24_TYPELESS;
case SVGA3D_X32_TYPELESS_G8X24_UINT:
return SVGA3D_R32_FLOAT_X8X24_TYPELESS;
case SVGA3D_X32_G8X24_UINT:
return SVGA3D_R32_FLOAT_X8X24;
case SVGA3D_R10G10B10A2_UINT:
case SVGA3D_R10G10B10A2_UNORM:
return SVGA3D_R10G10B10A2_TYPELESS;
@@ -1851,8 +1851,8 @@ svga_typeless_format(SVGA3dSurfaceFormat format)
return SVGA3D_R32_TYPELESS;
case SVGA3D_D24_UNORM_S8_UINT:
return SVGA3D_R24G8_TYPELESS;
case SVGA3D_X24_TYPELESS_G8_UINT:
return SVGA3D_R24_UNORM_X8_TYPELESS;
case SVGA3D_X24_G8_UINT:
return SVGA3D_R24_UNORM_X8;
case SVGA3D_R8G8_UNORM:
case SVGA3D_R8G8_SNORM:
case SVGA3D_R8G8_UINT:
@@ -1919,11 +1919,11 @@ svga_sampler_format(SVGA3dSurfaceFormat format)
case SVGA3D_D16_UNORM:
return SVGA3D_R16_UNORM;
case SVGA3D_D24_UNORM_S8_UINT:
return SVGA3D_R24_UNORM_X8_TYPELESS;
return SVGA3D_R24_UNORM_X8;
case SVGA3D_D32_FLOAT:
return SVGA3D_R32_FLOAT;
case SVGA3D_D32_FLOAT_S8X24_UINT:
return SVGA3D_R32_FLOAT_X8X24_TYPELESS;
return SVGA3D_R32_FLOAT_X8X24;
default:
return format;
}