projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_context.h
diff --git
a/src/gallium/drivers/svga/svga_context.h
b/src/gallium/drivers/svga/svga_context.h
index 1f66437dfe1aa033cccddfa6c333886bd6a9cb06..9a46de643fd20b1c1d159a7996b5ca63390506bf 100644
(file)
--- a/
src/gallium/drivers/svga/svga_context.h
+++ b/
src/gallium/drivers/svga/svga_context.h
@@
-190,7
+190,7
@@
struct svga_state
struct svga_vertex_shader *vs;
struct pipe_vertex_buffer vb[PIPE_MAX_ATTRIBS];
struct svga_vertex_shader *vs;
struct pipe_vertex_buffer vb[PIPE_MAX_ATTRIBS];
- struct pipe_
buffer
*cb[PIPE_SHADER_TYPES];
+ struct pipe_
resource
*cb[PIPE_SHADER_TYPES];
struct pipe_framebuffer_state framebuffer;
float depthscale;
struct pipe_framebuffer_state framebuffer;
float depthscale;
@@
-254,7
+254,7
@@
struct svga_hw_clear_state
struct svga_hw_view_state
{
struct svga_hw_view_state
{
- struct pipe_
textur
e *texture;
+ struct pipe_
resourc
e *texture;
struct svga_sampler_view *v;
unsigned min_lod;
unsigned max_lod;
struct svga_sampler_view *v;
unsigned min_lod;
unsigned max_lod;