projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "r300g: add generating texture coordinates for point sprites (WIP)"
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_emit.h
diff --git
a/src/gallium/drivers/r300/r300_emit.h
b/src/gallium/drivers/r300/r300_emit.h
index a2c2a91b88020def7f67a134e25dee485117ff9b..7db2fc6a1a10bc2ef2f60b322cd8bf8945e1c032 100644
(file)
--- a/
src/gallium/drivers/r300/r300_emit.h
+++ b/
src/gallium/drivers/r300/r300_emit.h
@@
-57,8
+57,7
@@
void r500_emit_fs_constant_buffer(struct r300_context* r300,
void r300_emit_fb_state(struct r300_context* r300, unsigned size, void* state);
void r300_emit_fb_state(struct r300_context* r300, unsigned size, void* state);
-void r300_emit_query_begin(struct r300_context* r300,
- struct r300_query* query);
+void r300_emit_query_start(struct r300_context* r300);
void r300_emit_query_end(struct r300_context* r300);
void r300_emit_query_end(struct r300_context* r300);
@@
-70,10
+69,8
@@
void r300_emit_rs_block_state(struct r300_context* r300,
void r300_emit_scissor_state(struct r300_context* r300,
unsigned size, void* state);
void r300_emit_scissor_state(struct r300_context* r300,
unsigned size, void* state);
-void r300_emit_texture(struct r300_context* r300,
- struct r300_sampler_state* sampler,
- struct r300_texture* tex,
- unsigned offset);
+void r300_emit_textures_state(struct r300_context *r300,
+ unsigned size, void *state);
void r300_emit_vertex_buffer(struct r300_context* r300);
void r300_emit_vertex_buffer(struct r300_context* r300);
@@
-83,9
+80,6
@@
void r300_emit_vertex_stream_state(struct r300_context* r300,
void r300_emit_vap_output_state(struct r300_context* r300,
unsigned size, void* state);
void r300_emit_vap_output_state(struct r300_context* r300,
unsigned size, void* state);
-void r300_emit_vertex_program_code(struct r300_context* r300,
- struct r300_vertex_program_code* code);
-
void r300_emit_vs_constant_buffer(struct r300_context* r300,
struct rc_constant_list* constants);
void r300_emit_vs_constant_buffer(struct r300_context* r300,
struct rc_constant_list* constants);
@@
-94,8
+88,6
@@
void r300_emit_vs_state(struct r300_context* r300, unsigned size, void* state);
void r300_emit_viewport_state(struct r300_context* r300,
unsigned size, void* state);
void r300_emit_viewport_state(struct r300_context* r300,
unsigned size, void* state);
-void r300_emit_texture_count(struct r300_context* r300);
-
void r300_emit_ztop_state(struct r300_context* r300,
unsigned size, void* state);
void r300_emit_ztop_state(struct r300_context* r300,
unsigned size, void* state);