summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Bacocco <tizbac2@gmail.com>2015-01-19 15:27:38 +0100
committerAxel Davy <axel.davy@ens.fr>2015-02-06 00:07:19 +0100
commit50f0e011da23945cb2219bf71c4dc7b1aeb5044f (patch)
tree7e9653844b4f49f9b594c246ed74ca7bf6a9e957
parentdfe5e84e74b184748c48cf07d58c79c2c5685a2d (diff)
st/nine: Setting D3DRS_ALPHAFUNC to 0 means D3DCMP_NEVER
Reviewed-by: Axel Davy <axel.davy@ens.fr> Signed-off-by: Tiziano Bacocco <tizbac2@gmail.com>
-rw-r--r--include/D3D9/d3d9types.h1
-rw-r--r--src/gallium/state_trackers/nine/nine_pipe.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/D3D9/d3d9types.h b/include/D3D9/d3d9types.h
index 5020934ddf..e96f751be4 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 640bbdbfbf..c1269b3d0d 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;