fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-13 05:08:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Fix u_hash_table rename.

Browse source
This commit is contained in:
Corbin Simpson 2009-10-17 20:05:23 -07:00
parent 4a98d19d1b
commit ce9ae4a483
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r300/r300_context.c
View file

@ -102,9 +102,9 @@ static void r300_destroy_context(struct pipe_context* context)
struct r300_context* r300 = r300_context(context);
struct r300_query* query, * temp;
u_hash_table_foreach(r300->shader_hash_table, r300_clear_hash_table,
util_hash_table_foreach(r300->shader_hash_table, r300_clear_hash_table,
NULL);
u_hash_table_destroy(r300->shader_hash_table);
util_hash_table_destroy(r300->shader_hash_table);
draw_destroy(r300->draw);
@ -180,7 +180,7 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
r300->context.is_texture_referenced = r300_is_texture_referenced;
r300->context.is_buffer_referenced = r300_is_buffer_referenced;
r300->shader_hash_table = u_hash_table_create(r300_shader_key_hash,
r300->shader_hash_table = util_hash_table_create(r300_shader_key_hash,
r300_shader_key_compare);
r300->blend_color_state = CALLOC_STRUCT(r300_blend_color_state);

2
src/gallium/drivers/r300/r300_context.h
View file

@ -252,7 +252,7 @@ struct r300_context {
/* Shader hash table. Used to store vertex formatting information, which
* depends on the combination of both currently loaded shaders. */
struct u_hash_table* shader_hash_table;
struct util_hash_table* shader_hash_table;
/* Vertex formatting information. */
struct r300_vertex_format* vertex_info;

8
src/gallium/drivers/r300/r300_state_derived.c
View file

@ -277,7 +277,7 @@ static void r300_update_vertex_format(struct r300_context* r300)
key->vs = r300->vs;
key->fs = r300->fs;
value = u_hash_table_get(r300->shader_hash_table, (void*)key);
value = util_hash_table_get(r300->shader_hash_table, (void*)key);
if (value) {
debug_printf("r300: Hash table hit! vs: %p fs: %p\n", key->vs,
key->fs);
@ -295,10 +295,8 @@ static void r300_update_vertex_format(struct r300_context* r300)
r300_vs_tab_routes(r300, vformat);
r300_vertex_psc(r300, vformat);
if (u_hash_table_set(r300->shader_hash_table, (void*)key,
(void*)vformat) != PIPE_OK) {
debug_printf("r300: Hash table insertion error!\n");
}
util_hash_table_set(r300->shader_hash_table,
(void*)key, (void*)vformat);
}
if (r300->vertex_info != vformat) {