From d2f2a550cf590ec1c9c4d94e07e1f0a0c837f891 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Sun, 7 Dec 2014 16:46:28 +0100 Subject: [PATCH] st/nine: Add new texture format strings Reviewed-by: Ilia Mirkin Reviewed-by: David Heidelberg Signed-off-by: Axel Davy Cc: "10.4" --- include/D3D9/d3d9types.h | 3 +++ src/gallium/state_trackers/nine/nine_pipe.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h index e53e3893c3e..456ae9ffb02 100644 --- a/include/D3D9/d3d9types.h +++ b/include/D3D9/d3d9types.h @@ -649,10 +649,13 @@ typedef enum _D3DFORMAT { D3DFMT_A1 = 118, D3DFMT_A2B10G10R10_XR_BIAS = 119, D3DFMT_BINARYBUFFER = 199, + D3DFMT_ATI1 = MAKEFOURCC('A', 'T', 'I', '1'), + D3DFMT_ATI2 = MAKEFOURCC('A', 'T', 'I', '2'), D3DFMT_DF16 = MAKEFOURCC('D', 'F', '1', '6'), D3DFMT_DF24 = MAKEFOURCC('D', 'F', '2', '4'), D3DFMT_INTZ = MAKEFOURCC('I', 'N', 'T', 'Z'), D3DFMT_NULL = MAKEFOURCC('N', 'U', 'L', 'L'), + D3DFMT_NVDB = MAKEFOURCC('N', 'V', 'D', 'B'), D3DFMT_NV11 = MAKEFOURCC('N', 'V', '1', '1'), D3DFMT_NV12 = MAKEFOURCC('N', 'V', '1', '2'), D3DFMT_Y210 = MAKEFOURCC('Y', '2', '1', '0'), diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h index 1fd16944fd5..06e4dc92aa8 100644 --- a/src/gallium/state_trackers/nine/nine_pipe.h +++ b/src/gallium/state_trackers/nine/nine_pipe.h @@ -249,6 +249,8 @@ d3dformat_to_string(D3DFORMAT fmt) case D3DFMT_DXT3: return "D3DFMT_DXT3"; case D3DFMT_DXT4: return "D3DFMT_DXT4"; case D3DFMT_DXT5: return "D3DFMT_DXT5"; + case D3DFMT_ATI1: return "D3DFMT_ATI1"; + case D3DFMT_ATI2: return "D3DFMT_ATI2"; case D3DFMT_D16_LOCKABLE: return "D3DFMT_D16_LOCKABLE"; case D3DFMT_D32: return "D3DFMT_D32"; case D3DFMT_D15S1: return "D3DFMT_D15S1"; @@ -279,6 +281,7 @@ d3dformat_to_string(D3DFORMAT fmt) case D3DFMT_DF16: return "D3DFMT_DF16"; case D3DFMT_DF24: return "D3DFMT_DF24"; case D3DFMT_INTZ: return "D3DFMT_INTZ"; + case D3DFMT_NVDB: return "D3DFMT_NVDB"; case D3DFMT_NULL: return "D3DFMT_NULL"; default: break; -- 2.30.2