diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-27 10:45:05 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-27 10:45:05 +0100 |
| commit | c74ef795c7282681616decc36a9a81cd1b1b6ec7 (patch) | |
| tree | beb5f13ba78bd7920eae918b6aa5db5bac83f0da /mesalib/src/mesa/drivers/common/meta.c | |
| parent | f51268259621a21d14e40b8a41c5803a5c2ce706 (diff) | |
| download | vcxsrv-c74ef795c7282681616decc36a9a81cd1b1b6ec7.tar.gz vcxsrv-c74ef795c7282681616decc36a9a81cd1b1b6ec7.tar.bz2 vcxsrv-c74ef795c7282681616decc36a9a81cd1b1b6ec7.zip | |
libX11 mesa pixman xkeyboard-config
xkeyboard-config commit 9993f996e75232385b19cc5078f7fecde6b399b9
libX11 commit b687440c28c7da6ee0ae44514d20248db5161606
pixman commit 2156fb51b353867d5a18b734690ca551f74d4fb1
mesa commit f987d23b28491bd7b0552bd9daffa53a8e073c71
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.c')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 4e32b5066..29a209ede 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1910,6 +1910,14 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, GLuint *tmp = malloc(srcW * srcH * sizeof(GLuint)); if (tmp) { + + newTex = alloc_texture(depthTex, srcW, srcH, GL_DEPTH_COMPONENT); + _mesa_ReadPixels(srcX, srcY, srcW, srcH, GL_DEPTH_COMPONENT, + GL_UNSIGNED_INT, tmp); + setup_drawpix_texture(ctx, depthTex, newTex, GL_DEPTH_COMPONENT, + srcW, srcH, GL_DEPTH_COMPONENT, + GL_UNSIGNED_INT, tmp); + /* texcoords (after texture allocation!) */ { verts[0].s = 0.0F; @@ -1928,15 +1936,6 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, if (!blit->DepthFP) init_blit_depth_pixels(ctx); - /* maybe change tex format here */ - newTex = alloc_texture(depthTex, srcW, srcH, GL_DEPTH_COMPONENT); - - _mesa_ReadPixels(srcX, srcY, srcW, srcH, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); - - setup_drawpix_texture(ctx, depthTex, newTex, GL_DEPTH_COMPONENT, srcW, srcH, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); - _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); |