diff options
| author | Marek Olšák <maraeo@gmail.com> | 2009-11-19 22:40:11 +0100 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-11-20 18:06:21 -0800 |
| commit | 435c495549d707432f9fb9868e665a42a6923058 (patch) | |
| tree | 00ced2b3a34d197caf37f8cd3fd0d51bb4b37abb | |
| parent | 624a0cd9c1bcc8d0952bb30e3336237fb99041b2 (diff) | |
r300g: silence warnings
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h index 41df31f670f..1ce5ff3904b 100644 --- a/src/gallium/drivers/r300/r300_screen.h +++ b/src/gallium/drivers/r300/r300_screen.h @@ -27,6 +27,8 @@ #include "r300_chipset.h" +struct r300_winsys; + struct r300_screen { /* Parent class */ struct pipe_screen screen; diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index 8faf78932dc..962754f3b16 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -47,8 +47,8 @@ struct r300_shader_derived_value { unsigned r300_shader_key_hash(void* key) { struct r300_shader_key* shader_key = (struct r300_shader_key*)key; - unsigned vs = (unsigned)shader_key->vs; - unsigned fs = (unsigned)shader_key->fs; + unsigned vs = (intptr_t)shader_key->vs; + unsigned fs = (intptr_t)shader_key->fs; return (vs << 16) | (fs & 0xffff); } |