← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/r600/r600_texstate.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/r600/r600_texstate.c
50
50
#include "r700_fragprog.h"
51
51
#include "r700_vertprog.h"
52
52
 
 
53
#include "evergreen_tex.h"
 
54
 
53
55
void r600UpdateTextureState(GLcontext * ctx);
54
56
 
55
57
void r600UpdateTextureState(GLcontext * ctx)
605
607
                }
606
608
                break;
607
609
        /* EXT_texture_sRGB */
608
 
        case MESA_FORMAT_SRGBA8:
 
610
        case MESA_FORMAT_SARGB8:
609
611
                SETfield(t->SQ_TEX_RESOURCE1, FMT_8_8_8_8,
610
612
                         SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_shift, SQ_TEX_RESOURCE_WORD1_0__DATA_FORMAT_mask);
611
613
 
612
 
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_W,
 
614
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_Z,
613
615
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_X_mask);
614
 
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_Z,
 
616
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_Y,
615
617
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_Y_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_Y_mask);
616
 
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_Y,
 
618
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_X,
617
619
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_Z_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_Z_mask);
618
 
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_X,
 
620
                SETfield(t->SQ_TEX_RESOURCE4, SQ_SEL_W,
619
621
                         SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_shift, SQ_TEX_RESOURCE_WORD4_0__DST_SEL_W_mask);
620
622
                SETbit(t->SQ_TEX_RESOURCE4, SQ_TEX_RESOURCE_WORD4_0__FORCE_DEGAMMA_bit);
621
623
                break;
878
880
                                                  RADEON_GEM_DOMAIN_GTT, 0);
879
881
        }
880
882
 
 
883
        pbo = (struct radeon_bo *)r700GetActiveFpShaderConstBo(ctx);
 
884
        if (pbo) {
 
885
                radeon_cs_space_add_persistent_bo(rmesa->radeon.cmdbuf.cs, pbo,
 
886
                                                  RADEON_GEM_DOMAIN_GTT, 0);
 
887
        }
 
888
 
 
889
        pbo = (struct radeon_bo *)r700GetActiveVpShaderConstBo(ctx);
 
890
        if (pbo) {
 
891
                radeon_cs_space_add_persistent_bo(rmesa->radeon.cmdbuf.cs, pbo,
 
892
                                                  RADEON_GEM_DOMAIN_GTT, 0);
 
893
        }       
 
894
 
881
895
        ret = radeon_cs_space_check_with_bo(rmesa->radeon.cmdbuf.cs, first_elem(&rmesa->radeon.dma.reserved)->bo, RADEON_GEM_DOMAIN_GTT, 0);
882
896
        if (ret)
883
897
                return GL_FALSE;
897
911
        if (!tObj)
898
912
                return;
899
913
 
 
914
    if(rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_CEDAR)
 
915
    {
 
916
        evergreenSetTexOffset(pDRICtx, texname, offset, depth, pitch);
 
917
        return;
 
918
    }    
 
919
 
900
920
        t->image_override = GL_TRUE;
901
921
 
902
922
        if (!offset)
989
1009
        radeon = pDRICtx->driverPrivate;
990
1010
        rmesa = pDRICtx->driverPrivate;
991
1011
 
 
1012
    if(rmesa->radeon.radeonScreen->chip_family >= CHIP_FAMILY_CEDAR)
 
1013
    {
 
1014
        evergreenSetTexBuffer(pDRICtx, target, glx_texture_format, dPriv);
 
1015
        return;
 
1016
    }   
 
1017
 
992
1018
        rfb = dPriv->driverPrivate;
993
1019
        texUnit = &radeon->glCtx->Texture.Unit[radeon->glCtx->Texture.CurrentUnit];
994
1020
        texObj = _mesa_select_tex_object(radeon->glCtx, texUnit, target);