diff options
| author | Charmaine Lee <[email protected]> | 2017-12-07 09:52:47 -0800 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-09-10 13:07:30 -0600 |
| commit | 6f254ad9b4c5cfe81c8f471d27cbaf0f9a74028e (patch) | |
| tree | 1a8acc2558eba37ee8d93b592f0fa57e26165943 /src/gallium | |
| parent | 49428c8d61274b452dc4885b44e4954d8634358e (diff) | |
svga: sync devcap name changes in svga3d_devcaps.h
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/svga/include/svga3d_devcaps.h | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_format.c | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/drivers/svga/include/svga3d_devcaps.h b/src/gallium/drivers/svga/include/svga3d_devcaps.h index 3077e0e6833..a519198b64e 100644 --- a/src/gallium/drivers/svga/include/svga3d_devcaps.h +++ b/src/gallium/drivers/svga/include/svga3d_devcaps.h @@ -341,8 +341,8 @@ typedef enum { SVGA3D_DEVCAP_DXFMT_R32G32_SINT = 158, SVGA3D_DEVCAP_DXFMT_R32G8X24_TYPELESS = 159, SVGA3D_DEVCAP_DXFMT_D32_FLOAT_S8X24_UINT = 160, - SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24_TYPELESS = 161, - SVGA3D_DEVCAP_DXFMT_X32_TYPELESS_G8X24_UINT = 162, + SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24 = 161, + SVGA3D_DEVCAP_DXFMT_X32_G8X24_UINT = 162, SVGA3D_DEVCAP_DXFMT_R10G10B10A2_TYPELESS = 163, SVGA3D_DEVCAP_DXFMT_R10G10B10A2_UINT = 164, SVGA3D_DEVCAP_DXFMT_R11G11B10_FLOAT = 165, @@ -360,8 +360,8 @@ typedef enum { SVGA3D_DEVCAP_DXFMT_R32_SINT = 177, SVGA3D_DEVCAP_DXFMT_R24G8_TYPELESS = 178, SVGA3D_DEVCAP_DXFMT_D24_UNORM_S8_UINT = 179, - SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8_TYPELESS = 180, - SVGA3D_DEVCAP_DXFMT_X24_TYPELESS_G8_UINT = 181, + SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8 = 180, + SVGA3D_DEVCAP_DXFMT_X24_G8_UINT = 181, SVGA3D_DEVCAP_DXFMT_R8G8_TYPELESS = 182, SVGA3D_DEVCAP_DXFMT_R8G8_UNORM = 183, SVGA3D_DEVCAP_DXFMT_R8G8_UINT = 184, diff --git a/src/gallium/drivers/svga/svga_format.c b/src/gallium/drivers/svga/svga_format.c index c9d5abe986e..0ad55c910c3 100644 --- a/src/gallium/drivers/svga/svga_format.c +++ b/src/gallium/drivers/svga/svga_format.c @@ -1019,13 +1019,13 @@ static const struct format_cap format_cap_table[] = { { "SVGA3D_R32_FLOAT_X8X24", SVGA3D_R32_FLOAT_X8X24, - SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24_TYPELESS, + SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24, 1, 1, 8, 0 }, { "SVGA3D_X32_G8X24_UINT", SVGA3D_X32_G8X24_UINT, - SVGA3D_DEVCAP_DXFMT_X32_TYPELESS_G8X24_UINT, + SVGA3D_DEVCAP_DXFMT_X32_G8X24_UINT, 1, 1, 4, 0 }, { @@ -1133,13 +1133,13 @@ static const struct format_cap format_cap_table[] = { { "SVGA3D_R24_UNORM_X8", SVGA3D_R24_UNORM_X8, - SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8_TYPELESS, + SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8, 1, 1, 4, 0 }, { "SVGA3D_X24_G8_UINT", SVGA3D_X24_G8_UINT, - SVGA3D_DEVCAP_DXFMT_X24_TYPELESS_G8_UINT, + SVGA3D_DEVCAP_DXFMT_X24_G8_UINT, 1, 1, 4, 0 }, { @@ -1622,8 +1622,8 @@ svga_devcap_name(SVGA3dDevCapIndex cap) DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R32G32_SINT), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R32G8X24_TYPELESS), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_D32_FLOAT_S8X24_UINT), - DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24_TYPELESS), - DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_X32_TYPELESS_G8X24_UINT), + DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R32_FLOAT_X8X24), + DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_X32_G8X24_UINT), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R10G10B10A2_TYPELESS), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R10G10B10A2_UINT), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R11G11B10_FLOAT), @@ -1641,8 +1641,8 @@ svga_devcap_name(SVGA3dDevCapIndex cap) DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R32_SINT), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R24G8_TYPELESS), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_D24_UNORM_S8_UINT), - DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8_TYPELESS), - DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_X24_TYPELESS_G8_UINT), + DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R24_UNORM_X8), + DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_X24_G8_UINT), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R8G8_TYPELESS), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R8G8_UNORM), DEBUG_NAMED_VALUE(SVGA3D_DEVCAP_DXFMT_R8G8_UINT), |