Mesa (master): r600g: merge r600_context with r600_pipe_context
Marek Olšák
mareko at kemper.freedesktop.org
Tue Jan 31 22:26:33 UTC 2012
Module: Mesa
Branch: master
Commit: e4340c1908a6a3b09e1a15d5195f6da7d00494d0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4340c1908a6a3b09e1a15d5195f6da7d00494d0
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun Jan 29 23:25:42 2012 +0100
r600g: merge r600_context with r600_pipe_context
The split made no sense.
---
src/gallium/drivers/r600/evergreen_hw_context.c | 1 -
src/gallium/drivers/r600/evergreen_state.c | 84 ++++++++--------
src/gallium/drivers/r600/r600.h | 52 +---------
src/gallium/drivers/r600/r600_asm.c | 4 +-
src/gallium/drivers/r600/r600_asm.h | 4 +-
src/gallium/drivers/r600/r600_blit.c | 26 +++---
src/gallium/drivers/r600/r600_buffer.c | 18 ++--
src/gallium/drivers/r600/r600_hw_context.c | 3 -
src/gallium/drivers/r600/r600_pipe.c | 32 +++---
src/gallium/drivers/r600/r600_pipe.h | 85 ++++++++++++----
src/gallium/drivers/r600/r600_query.c | 38 ++++----
src/gallium/drivers/r600/r600_resource.c | 2 +-
src/gallium/drivers/r600/r600_resource.h | 4 +-
src/gallium/drivers/r600/r600_shader.c | 10 +-
src/gallium/drivers/r600/r600_state.c | 92 +++++++++---------
src/gallium/drivers/r600/r600_state_common.c | 122 +++++++++++-----------
src/gallium/drivers/r600/r600_texture.c | 8 +-
src/gallium/drivers/r600/r600_translate.c | 2 +-
18 files changed, 291 insertions(+), 296 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=e4340c1908a6a3b09e1a15d5195f6da7d00494d0
More information about the mesa-commit
mailing list