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_blit.c
diff --git
a/src/gallium/drivers/r300/r300_blit.c
b/src/gallium/drivers/r300/r300_blit.c
index a60b12844d6398b32816ad9681020ffd2f255cf1..bcdf950df9cfcba70332c7d5871174218a3c6707 100644
(file)
--- a/
src/gallium/drivers/r300/r300_blit.c
+++ b/
src/gallium/drivers/r300/r300_blit.c
@@
-114,8
+114,8
@@
static void r300_hw_copy(struct pipe_context* pipe,
r300->blitter, state->sampler_count, (void**)state->sampler_states);
util_blitter_save_fragment_sampler_views(
r300->blitter, state->sampler_count, (void**)state->sampler_states);
util_blitter_save_fragment_sampler_views(
- r300->blitter,
r300->fragment_sampler_view
_count,
-
r300
->fragment_sampler_views);
+ r300->blitter,
state->texture
_count,
+
state
->fragment_sampler_views);
/* Do a copy */
util_blitter_copy(r300->blitter,
/* Do a copy */
util_blitter_copy(r300->blitter,
@@
-149,6
+149,9
@@
void r300_surface_copy(struct pipe_context* pipe,
case 4:
new_format = PIPE_FORMAT_B8G8R8A8_UNORM;
break;
case 4:
new_format = PIPE_FORMAT_B8G8R8A8_UNORM;
break;
+ case 8:
+ new_format = PIPE_FORMAT_R16G16B16A16_UNORM;
+ break;
default:
debug_printf("r300: surface_copy: Unhandled format: %s. Falling back to software.\n"
"r300: surface_copy: Software fallback doesn't work for tiled textures.\n",
default:
debug_printf("r300: surface_copy: Unhandled format: %s. Falling back to software.\n"
"r300: surface_copy: Software fallback doesn't work for tiled textures.\n",