projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nouveau: nv30: Relax some limits. We can render to z24s8 buffer even if color buffer...
[mesa.git]
/
src
/
gallium
/
drivers
/
nv30
/
nv30_state.h
diff --git
a/src/gallium/drivers/nv30/nv30_state.h
b/src/gallium/drivers/nv30/nv30_state.h
index c65a937467ed2f50dad9c6e8a5436ae9184fb01a..e6f23bf166715c2fbcaf4e03d994212d6d74f2b9 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_state.h
+++ b/
src/gallium/drivers/nv30/nv30_state.h
@@
-2,6
+2,7
@@
#define __NV30_STATE_H__
#include "pipe/p_state.h"
#define __NV30_STATE_H__
#include "pipe/p_state.h"
+#include "tgsi/tgsi_scan.h"
struct nv30_sampler_state {
uint32_t fmt;
struct nv30_sampler_state {
uint32_t fmt;
@@
-26,6
+27,7
@@
struct nv30_vertex_program {
struct pipe_shader_state pipe;
boolean translated;
struct pipe_shader_state pipe;
boolean translated;
+
struct nv30_vertex_program_exec *insns;
unsigned nr_insns;
struct nv30_vertex_program_data *consts;
struct nv30_vertex_program_exec *insns;
unsigned nr_insns;
struct nv30_vertex_program_data *consts;
@@
-39,6
+41,7
@@
struct nv30_vertex_program {
uint32_t ir;
uint32_t or;
uint32_t ir;
uint32_t or;
+ struct nouveau_stateobj *so;
};
struct nv30_fragment_program_data {
};
struct nv30_fragment_program_data {
@@
-48,6
+51,7
@@
struct nv30_fragment_program_data {
struct nv30_fragment_program {
struct pipe_shader_state pipe;
struct nv30_fragment_program {
struct pipe_shader_state pipe;
+ struct tgsi_shader_info info;
boolean translated;
boolean on_hw;
boolean translated;
boolean on_hw;
@@
-63,6
+67,7
@@
struct nv30_fragment_program {
uint32_t fp_control;
uint32_t fp_reg_control;
uint32_t fp_control;
uint32_t fp_reg_control;
+ struct nouveau_stateobj *so;
};
struct nv30_miptree {
};
struct nv30_miptree {