diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-09-01 13:04:42 -0400 |
|---|---|---|
| committer | Jerome Glisse <jglisse@redhat.com> | 2010-09-01 13:04:42 -0400 |
| commit | 15ce70252c5357081a61f3494261c7e343174301 (patch) | |
| tree | 896ad87c15a6aad2bf40cca8e69ab2e25420e152 /src/gallium/drivers/r600/r600_screen.h | |
| parent | 4a955ab6b78e3b3a4cdd54dc933715f0dafbe7f4 (diff) | |
Revert "Revert "r600g: precompute some of the hw state""
This reverts commit 1fa7245c348cb7aced81f1672140f64cb6450e2f.
Conflicts:
src/gallium/drivers/r600/r600_state.c
Diffstat (limited to 'src/gallium/drivers/r600/r600_screen.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_screen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_screen.h b/src/gallium/drivers/r600/r600_screen.h index 438976f654..b9938f117a 100644 --- a/src/gallium/drivers/r600/r600_screen.h +++ b/src/gallium/drivers/r600/r600_screen.h @@ -84,7 +84,7 @@ void* r600_texture_transfer_map(struct pipe_context *ctx, void r600_texture_transfer_unmap(struct pipe_context *ctx, struct pipe_transfer* transfer); int r600_texture_scissor(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned level); -int r600_texture_cb0(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned level); +int r600_texture_cb(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned cb, unsigned level); int r600_texture_db(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned level); int r600_texture_from_depth(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned level); int r600_texture_viewport(struct pipe_context *ctx, struct r600_resource_texture *rtexture, unsigned level); |