From 50f0e011da23945cb2219bf71c4dc7b1aeb5044f Mon Sep 17 00:00:00 2001 From: Tiziano Bacocco Date: Mon, 19 Jan 2015 15:27:38 +0100 Subject: [PATCH] st/nine: Setting D3DRS_ALPHAFUNC to 0 means D3DCMP_NEVER Reviewed-by: Axel Davy Signed-off-by: Tiziano Bacocco --- include/D3D9/d3d9types.h | 1 + src/gallium/state_trackers/nine/nine_pipe.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h index 5020934ddfe..e96f751be4b 100644 --- a/include/D3D9/d3d9types.h +++ b/include/D3D9/d3d9types.h @@ -472,6 +472,7 @@ typedef enum _D3DBUSTYPE { } D3DBUSTYPE; typedef enum _D3DCMPFUNC { + D3DCMP_NEVER_ZERO = 0, //Needed to avoid warnings D3DCMP_NEVER = 1, D3DCMP_LESS = 2, D3DCMP_EQUAL = 3, diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h index 640bbdbfbf2..c1269b3d0d9 100644 --- a/src/gallium/state_trackers/nine/nine_pipe.h +++ b/src/gallium/state_trackers/nine/nine_pipe.h @@ -472,6 +472,7 @@ d3dcmpfunc_to_pipe_func(D3DCMPFUNC func) case D3DCMP_NOTEQUAL: return PIPE_FUNC_NOTEQUAL; case D3DCMP_GREATEREQUAL: return PIPE_FUNC_GEQUAL; case D3DCMP_ALWAYS: return PIPE_FUNC_ALWAYS; + case D3DCMP_NEVER_ZERO: return PIPE_FUNC_NEVER; // Tested on windows + ATI HD5770 default: assert(0); return PIPE_FUNC_NEVER; -- 2.30.2