projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
auxiliary
/
draw
/
draw_private.h
diff --git
a/src/gallium/auxiliary/draw/draw_private.h
b/src/gallium/auxiliary/draw/draw_private.h
index 5d531146c5fe76b7dcc109b8b30c6390944e1ee2..41fcb16a0a5a1df71c3de27bbafaec358fd5b61c 100644
(file)
--- a/
src/gallium/auxiliary/draw/draw_private.h
+++ b/
src/gallium/auxiliary/draw/draw_private.h
@@
-44,7
+44,6
@@
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
-#include "tgsi/tgsi_exec.h"
#include "tgsi/tgsi_scan.h"
#include "tgsi/tgsi_scan.h"
@@
-55,6
+54,8
@@
struct draw_vertex_shader;
struct draw_context;
struct draw_stage;
struct vbuf_render;
struct draw_context;
struct draw_stage;
struct vbuf_render;
+struct tgsi_exec_machine;
+struct tgsi_sampler;
/**
/**
@@
-172,6
+173,8
@@
struct draw_context
boolean force_passthrough; /**< never clip or shade */
boolean force_passthrough; /**< never clip or shade */
+ double mrd; /**< minimum resolvable depth value, for polygon offset */
+
/* pipe state that we need: */
const struct pipe_rasterizer_state *rasterizer;
struct pipe_viewport_state viewport;
/* pipe state that we need: */
const struct pipe_rasterizer_state *rasterizer;
struct pipe_viewport_state viewport;
@@
-183,7
+186,10
@@
struct draw_context
uint position_output;
/** TGSI program interpreter runtime state */
uint position_output;
/** TGSI program interpreter runtime state */
- struct tgsi_exec_machine machine;
+ struct tgsi_exec_machine *machine;
+
+ uint num_samplers;
+ struct tgsi_sampler **samplers;
/* This (and the tgsi_exec_machine struct) probably need to be moved somewhere private.
*/
/* This (and the tgsi_exec_machine struct) probably need to be moved somewhere private.
*/