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
/
drivers
/
i915
/
i915_context.h
diff --git
a/src/gallium/drivers/i915/i915_context.h
b/src/gallium/drivers/i915/i915_context.h
index 49945376837cee71929670930c2f70ef29d0aa30..9d03ca37fda522823dcd9b05c17703f3afd7738a 100644
(file)
--- a/
src/gallium/drivers/i915/i915_context.h
+++ b/
src/gallium/drivers/i915/i915_context.h
@@
-247,14
+247,14
@@
struct i915_context
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;
- struct
i915_texture *texture
[PIPE_MAX_SAMPLERS];
+ struct
pipe_sampler_view *fragment_sampler_views
[PIPE_MAX_SAMPLERS];
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
unsigned dirty;
unsigned num_samplers;
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
unsigned dirty;
unsigned num_samplers;
- unsigned num_
texture
s;
+ unsigned num_
fragment_sampler_view
s;
unsigned num_vertex_buffers;
struct intel_batchbuffer *batch;
unsigned num_vertex_buffers;
struct intel_batchbuffer *batch;
@@
-283,7
+283,7
@@
struct i915_context
#define I915_NEW_ALPHA_TEST 0x100
#define I915_NEW_DEPTH_STENCIL 0x200
#define I915_NEW_SAMPLER 0x400
#define I915_NEW_ALPHA_TEST 0x100
#define I915_NEW_DEPTH_STENCIL 0x200
#define I915_NEW_SAMPLER 0x400
-#define I915_NEW_
TEXTURE
0x800
+#define I915_NEW_
SAMPLER_VIEW
0x800
#define I915_NEW_CONSTANTS 0x1000
#define I915_NEW_VBO 0x2000
#define I915_NEW_VS 0x4000
#define I915_NEW_CONSTANTS 0x1000
#define I915_NEW_VBO 0x2000
#define I915_NEW_VS 0x4000