diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2010-01-19 23:34:56 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2010-01-19 23:38:34 +0100 |
| commit | 8a4d7393bd8a752eba2ee687c1c3e2df5c82745d (patch) | |
| tree | 84feaf9404112966496da8d8c38aaac0d6711fc9 /src/mesa/drivers/dri/r600/r600_context.c | |
| parent | 0aed44f8a36d4974d42f643c5065f2a4d96fc619 (diff) | |
radeon/r300/r600: share common glCopyTex(Sub)Image code
Diffstat (limited to 'src/mesa/drivers/dri/r600/r600_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r600_context.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c index 55680fad32..68112c49dc 100644 --- a/src/mesa/drivers/dri/r600/r600_context.c +++ b/src/mesa/drivers/dri/r600/r600_context.c @@ -65,6 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r600_emit.h" #include "radeon_bocs_wrapper.h" #include "radeon_queryobj.h" +#include "r600_blit.h" #include "r700_state.h" #include "r700_ioctl.h" @@ -240,6 +241,7 @@ static void r600_init_vtbl(radeonContextPtr radeon) radeon->vtbl.pre_emit_atoms = r600_vtbl_pre_emit_atoms; radeon->vtbl.fallback = r600_fallback; radeon->vtbl.emit_query_finish = r600_emit_query_finish; + radeon->vtbl.blit = r600_blit; } static void r600InitConstValues(GLcontext *ctx, radeonScreenPtr screen) @@ -378,16 +380,12 @@ GLboolean r600CreateContext(const __GLcontextModes * glVisual, _mesa_init_driver_functions(&functions); r700InitStateFuncs(&functions); - r600InitTextureFuncs(&functions); + r600InitTextureFuncs(&r600->radeon, &functions); r700InitShaderFuncs(&functions); radeonInitQueryObjFunctions(&functions); r700InitIoctlFuncs(&functions); radeonInitBufferObjectFuncs(&functions); - if (r600->radeon.radeonScreen->kernel_mm) { - r600_init_texcopy_functions(&functions); - } - if (!radeonInitContext(&r600->radeon, &functions, glVisual, driContextPriv, sharedContextPrivate)) { |