diff options
| author | Paul Berry <[email protected]> | 2013-04-28 07:43:18 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2013-09-17 15:18:07 -0700 |
| commit | 9791af90e3025fdec090808316e8fe130478dcc9 (patch) | |
| tree | 8a7f73be49c1908adb2c16353b294988976ad3f7 /src/mesa | |
| parent | 93b5f7117962ce6f30f4970eb7177b6755f90181 (diff) | |
i965/gs: Add new primitive types.
As part of its support for geometry shaders, GL 3.2 introduces four
new primitive types: GL_LINES_ADJACENCY, GL_LINE_STRIP_ADJACENCY,
GL_TRIANGLES_ADJACENCY, and GL_TRIANGLE_STRIP_ADJACENCY.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 9d41529edb7..494693cc3a0 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1638,7 +1638,7 @@ gen7_emit_depth_stencil_hiz(struct brw_context *brw, uint32_t width, uint32_t height, uint32_t tile_x, uint32_t tile_y); -extern const GLuint prim_to_hw_prim[GL_POLYGON+1]; +extern const GLuint prim_to_hw_prim[GL_TRIANGLE_STRIP_ADJACENCY+1]; void brw_setup_vec4_key_clip_info(struct brw_context *brw, diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 42f268598d4..549f9d0a598 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -54,7 +54,7 @@ #define FILE_DEBUG_FLAG DEBUG_PRIMS -const GLuint prim_to_hw_prim[GL_POLYGON+1] = { +const GLuint prim_to_hw_prim[GL_TRIANGLE_STRIP_ADJACENCY+1] = { _3DPRIM_POINTLIST, _3DPRIM_LINELIST, _3DPRIM_LINELOOP, @@ -64,7 +64,11 @@ const GLuint prim_to_hw_prim[GL_POLYGON+1] = { _3DPRIM_TRIFAN, _3DPRIM_QUADLIST, _3DPRIM_QUADSTRIP, - _3DPRIM_POLYGON + _3DPRIM_POLYGON, + _3DPRIM_LINELIST_ADJ, + _3DPRIM_LINESTRIP_ADJ, + _3DPRIM_TRILIST_ADJ, + _3DPRIM_TRISTRIP_ADJ, }; |