Commit 3b07e705 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Add d3d10 primitive types.

parent 3f9e0d93
...@@ -56,6 +56,18 @@ static GLenum primitive_to_gl(WINED3DPRIMITIVETYPE primitive_type) ...@@ -56,6 +56,18 @@ static GLenum primitive_to_gl(WINED3DPRIMITIVETYPE primitive_type)
case WINED3DPT_TRIANGLEFAN: case WINED3DPT_TRIANGLEFAN:
return GL_TRIANGLE_FAN; return GL_TRIANGLE_FAN;
case WINED3DPT_LINELIST_ADJ:
return GL_LINES_ADJACENCY_ARB;
case WINED3DPT_LINESTRIP_ADJ:
return GL_LINE_STRIP_ADJACENCY_ARB;
case WINED3DPT_TRIANGLELIST_ADJ:
return GL_TRIANGLES_ADJACENCY_ARB;
case WINED3DPT_TRIANGLESTRIP_ADJ:
return GL_TRIANGLE_STRIP_ADJACENCY_ARB;
default: default:
FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type));
return GL_NONE; return GL_NONE;
......
...@@ -918,12 +918,17 @@ const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { ...@@ -918,12 +918,17 @@ const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) {
const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) { const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) {
switch (PrimitiveType) { switch (PrimitiveType) {
#define PRIM_TO_STR(prim) case prim: return #prim #define PRIM_TO_STR(prim) case prim: return #prim
PRIM_TO_STR(WINED3DPT_UNDEFINED);
PRIM_TO_STR(WINED3DPT_POINTLIST); PRIM_TO_STR(WINED3DPT_POINTLIST);
PRIM_TO_STR(WINED3DPT_LINELIST); PRIM_TO_STR(WINED3DPT_LINELIST);
PRIM_TO_STR(WINED3DPT_LINESTRIP); PRIM_TO_STR(WINED3DPT_LINESTRIP);
PRIM_TO_STR(WINED3DPT_TRIANGLELIST); PRIM_TO_STR(WINED3DPT_TRIANGLELIST);
PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP); PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP);
PRIM_TO_STR(WINED3DPT_TRIANGLEFAN); PRIM_TO_STR(WINED3DPT_TRIANGLEFAN);
PRIM_TO_STR(WINED3DPT_LINELIST_ADJ);
PRIM_TO_STR(WINED3DPT_LINESTRIP_ADJ);
PRIM_TO_STR(WINED3DPT_TRIANGLELIST_ADJ);
PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP_ADJ);
#undef PRIM_TO_STR #undef PRIM_TO_STR
default: default:
FIXME("Unrecognized %u WINED3DPRIMITIVETYPE!\n", PrimitiveType); FIXME("Unrecognized %u WINED3DPRIMITIVETYPE!\n", PrimitiveType);
......
...@@ -97,12 +97,17 @@ typedef enum _WINED3DLIGHTTYPE ...@@ -97,12 +97,17 @@ typedef enum _WINED3DLIGHTTYPE
typedef enum _WINED3DPRIMITIVETYPE typedef enum _WINED3DPRIMITIVETYPE
{ {
WINED3DPT_UNDEFINED = 0,
WINED3DPT_POINTLIST = 1, WINED3DPT_POINTLIST = 1,
WINED3DPT_LINELIST = 2, WINED3DPT_LINELIST = 2,
WINED3DPT_LINESTRIP = 3, WINED3DPT_LINESTRIP = 3,
WINED3DPT_TRIANGLELIST = 4, WINED3DPT_TRIANGLELIST = 4,
WINED3DPT_TRIANGLESTRIP = 5, WINED3DPT_TRIANGLESTRIP = 5,
WINED3DPT_TRIANGLEFAN = 6, WINED3DPT_TRIANGLEFAN = 6,
WINED3DPT_LINELIST_ADJ = 10,
WINED3DPT_LINESTRIP_ADJ = 11,
WINED3DPT_TRIANGLELIST_ADJ = 12,
WINED3DPT_TRIANGLESTRIP_ADJ = 13,
WINED3DPT_FORCE_DWORD = 0x7fffffff WINED3DPT_FORCE_DWORD = 0x7fffffff
} WINED3DPRIMITIVETYPE; } WINED3DPRIMITIVETYPE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment