projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_context.h
diff --git
a/src/gallium/drivers/softpipe/sp_context.h
b/src/gallium/drivers/softpipe/sp_context.h
index 75e03c8ae6b179b9587a9e14a3ab53f45de93b8d..92607874b60912f4f0d3551be46b1d2615a87cfe 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_context.h
+++ b/
src/gallium/drivers/softpipe/sp_context.h
@@
-38,6
+38,10
@@
#include "sp_quad_pipe.h"
#include "sp_quad_pipe.h"
+/** Do polygon stipple in the driver here, or in the draw module? */
+#define DO_PSTIPPLE_IN_DRAW_MODULE 1
+
+
struct softpipe_vbuf_render;
struct draw_context;
struct draw_stage;
struct softpipe_vbuf_render;
struct draw_context;
struct draw_stage;
@@
-66,7
+70,7
@@
struct softpipe_context {
struct pipe_blend_color blend_color;
struct pipe_stencil_ref stencil_ref;
struct pipe_clip_state clip;
struct pipe_blend_color blend_color;
struct pipe_stencil_ref stencil_ref;
struct pipe_clip_state clip;
- struct pipe_
buffer
*constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
+ struct pipe_
resource
*constants[PIPE_SHADER_TYPES][PIPE_MAX_CONSTANT_BUFFERS];
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
@@
-126,6
+130,7
@@
struct softpipe_context {
struct quad_stage *shade;
struct quad_stage *depth_test;
struct quad_stage *blend;
struct quad_stage *shade;
struct quad_stage *depth_test;
struct quad_stage *blend;
+ struct quad_stage *pstipple;
struct quad_stage *first; /**< points to one of the above stages */
} quad;
struct quad_stage *first; /**< points to one of the above stages */
} quad;