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_7_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_pipe_constants.c
diff --git
a/src/gallium/drivers/svga/svga_pipe_constants.c
b/src/gallium/drivers/svga/svga_pipe_constants.c
index 10e7a121892af8aa32acfe4740dac0d623beaefb..93022f3cc51e2d91b1f939165b7c193cdbb7ac4b 100644
(file)
--- a/
src/gallium/drivers/svga/svga_pipe_constants.c
+++ b/
src/gallium/drivers/svga/svga_pipe_constants.c
@@
-30,9
+30,6
@@
#include "tgsi/tgsi_parse.h"
#include "svga_context.h"
#include "tgsi/tgsi_parse.h"
#include "svga_context.h"
-#include "svga_state.h"
-#include "svga_hw_reg.h"
-#include "svga_cmd.h"
/***********************************************************************
* Constant buffers
/***********************************************************************
* Constant buffers
@@
-49,7
+46,7
@@
struct svga_constbuf
static void svga_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
static void svga_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
-
const struct pipe_constant
_buffer *buf)
+
struct pipe
_buffer *buf)
{
struct svga_context *svga = svga_context(pipe);
{
struct svga_context *svga = svga_context(pipe);
@@
-57,7
+54,7
@@
static void svga_set_constant_buffer(struct pipe_context *pipe,
assert(index == 0);
pipe_buffer_reference( &svga->curr.cb[shader],
assert(index == 0);
pipe_buffer_reference( &svga->curr.cb[shader],
- buf
->buffer
);
+ buf );
if (shader == PIPE_SHADER_FRAGMENT)
svga->dirty |= SVGA_NEW_FS_CONST_BUFFER;
if (shader == PIPE_SHADER_FRAGMENT)
svga->dirty |= SVGA_NEW_FS_CONST_BUFFER;