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' into gallium-sampler-view
[mesa.git]
/
src
/
gallium
/
state_trackers
/
python
/
st_device.h
diff --git
a/src/gallium/state_trackers/python/st_device.h
b/src/gallium/state_trackers/python/st_device.h
index a246b6a1f25b495e5e3f03d7679fc598f043f60e..dcd0dc6e2737beb57a3ae2aa04a0cc4fabfcfdd2 100644
(file)
--- a/
src/gallium/state_trackers/python/st_device.h
+++ b/
src/gallium/state_trackers/python/st_device.h
@@
-47,19
+47,21
@@
struct st_surface
};
};
-struct st_context {
+struct st_context
+{
struct st_device *st_dev;
struct st_device *st_dev;
- struct pipe_context *real_pipe;
struct pipe_context *pipe;
struct cso_context *cso;
void *vs;
void *fs;
struct pipe_context *pipe;
struct cso_context *cso;
void *vs;
void *fs;
+ void *gs;
struct pipe_texture *default_texture;
struct pipe_texture *default_texture;
- struct pipe_texture *sampler_textures[PIPE_MAX_SAMPLERS];
+ struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
+ struct pipe_sampler_view *vertex_sampler_views[PIPE_MAX_VERTEX_SAMPLERS];
unsigned num_vertex_buffers;
struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS];
unsigned num_vertex_buffers;
struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS];
@@
-71,13
+73,11
@@
struct st_context {
};
};
-struct st_device {
+struct st_device
+{
/* FIXME: we also need to refcount for textures and surfaces... */
struct pipe_reference reference;
/* FIXME: we also need to refcount for textures and surfaces... */
struct pipe_reference reference;
- const struct st_winsys *st_ws;
-
- struct pipe_screen *real_screen;
struct pipe_screen *screen;
};
struct pipe_screen *screen;
};