projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nv10, nv20: Fix build.
[mesa.git]
/
src
/
gallium
/
drivers
/
nv10
/
nv10_state.h
diff --git
a/src/gallium/drivers/nv10/nv10_state.h
b/src/gallium/drivers/nv10/nv10_state.h
index 3ca501d135641e2c60e43d8850fdf927c6939c97..2524ac02e29d95bb39cbc4879eb894a84e18456c 100644
(file)
--- a/
src/gallium/drivers/nv10/nv10_state.h
+++ b/
src/gallium/drivers/nv10/nv10_state.h
@@
-2,7
+2,7
@@
#define __NV10_STATE_H__
#include "pipe/p_state.h"
#define __NV10_STATE_H__
#include "pipe/p_state.h"
-#include "tgsi/
util/
tgsi_scan.h"
+#include "tgsi/tgsi_scan.h"
struct nv10_blend_state {
uint32_t b_enable;
struct nv10_blend_state {
uint32_t b_enable;
@@
-79,7
+79,7
@@
struct nv10_fragment_program_data {
};
struct nv10_fragment_program {
};
struct nv10_fragment_program {
-
const struct pipe_shader_state *
pipe;
+
struct pipe_shader_state
pipe;
struct tgsi_shader_info info;
boolean translated;
struct tgsi_shader_info info;
boolean translated;
@@
-126,6
+126,7
@@
struct nv10_depth_stencil_alpha_state {
struct nv10_miptree {
struct pipe_texture base;
struct nv10_miptree {
struct pipe_texture base;
+ struct nouveau_bo *bo;
struct pipe_buffer *buffer;
uint total_size;
struct pipe_buffer *buffer;
uint total_size;