summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Bacocco <tizbac2@gmail.com>2015-01-19 15:40:22 +0100
committerAxel Davy <axel.davy@ens.fr>2015-02-06 00:07:19 +0100
commit1c1d26cd97a0dd85c8c2f447d6f254df17658b4c (patch)
treeda1ea600441ef616a3be923a7fbae97340ab6d18
parent50f0e011da23945cb2219bf71c4dc7b1aeb5044f (diff)
st/nine: D3DRS_FILLMODE set to 0 is D3DFILL_SOLID
Reviewed-by: Axel Davy <axel.davy@ens.fr> Reviewed-by: David Heidelberg <david@ixit.cz> 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 e96f751be4..52fbc99dad 100644
--- a/include/D3D9/d3d9types.h
+++ b/include/D3D9/d3d9types.h
@@ -573,6 +573,7 @@ typedef enum _D3DDEVTYPE {
} D3DDEVTYPE;
typedef enum _D3DFILLMODE {
+ D3DFILL_SOLID_ZERO = 0,
D3DFILL_POINT = 1,
D3DFILL_WIREFRAME = 2,
D3DFILL_SOLID = 3
diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h
index c1269b3d0d..9521d1a654 100644
--- a/src/gallium/state_trackers/nine/nine_pipe.h
+++ b/src/gallium/state_trackers/nine/nine_pipe.h
@@ -516,6 +516,7 @@ d3dfillmode_to_pipe_polygon_mode(D3DFILLMODE mode)
case D3DFILL_POINT: return PIPE_POLYGON_MODE_POINT;
case D3DFILL_WIREFRAME: return PIPE_POLYGON_MODE_LINE;
case D3DFILL_SOLID: return PIPE_POLYGON_MODE_FILL;
+ case D3DFILL_SOLID_ZERO:return PIPE_POLYGON_MODE_FILL;
default:
assert(0);
return PIPE_POLYGON_MODE_FILL;