projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into pipe-video
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_vs.h
diff --git
a/src/gallium/drivers/r300/r300_vs.h
b/src/gallium/drivers/r300/r300_vs.h
index f6f0b86b683edc946afd71a3dac0d05fa35407e1..170de6c79dbbbc0ddcbef18b92d3a3764746c9fd 100644
(file)
--- a/
src/gallium/drivers/r300/r300_vs.h
+++ b/
src/gallium/drivers/r300/r300_vs.h
@@
-39,13
+39,14
@@
struct r300_vertex_shader {
struct tgsi_shader_info info;
struct r300_shader_semantics outputs;
struct tgsi_shader_info info;
struct r300_shader_semantics outputs;
- struct r300_vap_output_state vap_out;
- /* Stream locations for SWTCL or if TCL is bypassed. */
- int stream_loc_notcl[16];
+ /* Whether the shader was replaced by a dummy one due to a shader
+ * compilation failure. */
+ boolean dummy;
- /* Output stream location for WPOS. */
- int wpos_tex_output;
+ /* Numbers of constants for each type. */
+ unsigned externals_count;
+ unsigned immediates_count;
/* HWTCL-specific. */
/* Machine code (if translated) */
/* HWTCL-specific. */
/* Machine code (if translated) */
@@
-55,13
+56,12
@@
struct r300_vertex_shader {
void *draw_vs;
};
void *draw_vs;
};
-void r300_vertex_shader_common_init(struct r300_vertex_shader *vs,
- const struct pipe_shader_state *shader);
+void r300_init_vs_outputs(struct r300_vertex_shader *vs);
-void r300_translate_vertex_shader(struct r300_context
*
r300,
- struct r300_vertex_shader
*
vs);
+void r300_translate_vertex_shader(struct r300_context
*
r300,
+ struct r300_vertex_shader
*
vs);
-/* Return TRUE if VAP (hwfmt) needs to be re-emitted. */
-
boolean r300_vertex_shader_setup_wpos(struct r300_context* r300
);
+void r300_draw_init_vertex_shader(struct draw_context *draw,
+
struct r300_vertex_shader *vs
);
#endif /* R300_VS_H */
#endif /* R300_VS_H */