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

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/r600/r700_state.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
[ 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:
39
39
#include "swrast_setup/swrast_setup.h"
40
40
#include "main/api_arrayelt.h"
41
41
#include "main/framebuffer.h"
 
42
#include "drivers/common/meta.h"
42
43
 
43
 
#include "shader/prog_parameter.h"
44
 
#include "shader/prog_statevars.h"
 
44
#include "program/prog_parameter.h"
 
45
#include "program/prog_statevars.h"
45
46
#include "vbo/vbo.h"
46
47
 
47
48
#include "r600_context.h"
1579
1580
            CLEARbit(r700->sq_config.SQ_CONFIG.u32All, VC_ENABLE_bit);
1580
1581
    else
1581
1582
            SETbit(r700->sq_config.SQ_CONFIG.u32All, VC_ENABLE_bit);
1582
 
    SETbit(r700->sq_config.SQ_CONFIG.u32All, DX9_CONSTS_bit);
 
1583
 
 
1584
    if(GL_TRUE == r700->bShaderUseMemConstant)
 
1585
    {
 
1586
        CLEARbit(r700->sq_config.SQ_CONFIG.u32All, DX9_CONSTS_bit);
 
1587
    }
 
1588
    else
 
1589
    {
 
1590
        SETbit(r700->sq_config.SQ_CONFIG.u32All, DX9_CONSTS_bit);
 
1591
    }
 
1592
 
1583
1593
    SETbit(r700->sq_config.SQ_CONFIG.u32All, ALU_INST_PREFER_VECTOR_bit);
1584
1594
    SETfield(r700->sq_config.SQ_CONFIG.u32All, ps_prio, PS_PRIO_shift, PS_PRIO_mask);
1585
1595
    SETfield(r700->sq_config.SQ_CONFIG.u32All, vs_prio, VS_PRIO_shift, VS_PRIO_mask);
1688
1698
            SETbit(r700->PA_SC_MODE_CNTL.u32All, FORCE_EOV_CNTDWN_ENABLE_bit);
1689
1699
    }
1690
1700
 
1691
 
    /* Do scale XY and Z by 1/W0. */
1692
 
    r700->bEnablePerspective = GL_TRUE;
 
1701
    /* Do scale XY and Z by 1/W0. */   
 
1702
    r700->bEnablePerspective = GL_TRUE;    
 
1703
 
1693
1704
    CLEARbit(r700->PA_CL_VTE_CNTL.u32All, VTX_XY_FMT_bit);
1694
1705
    CLEARbit(r700->PA_CL_VTE_CNTL.u32All, VTX_Z_FMT_bit);
1695
1706
    SETbit(r700->PA_CL_VTE_CNTL.u32All, VTX_W0_FMT_bit);
1819
1830
 
1820
1831
}
1821
1832
 
1822
 
void r700InitStateFuncs(struct dd_function_table *functions) //-----------------
 
1833
void r700InitStateFuncs(radeonContextPtr radeon, struct dd_function_table *functions)
1823
1834
{
1824
1835
        functions->UpdateState = r700InvalidateState;
1825
1836
        functions->AlphaFunc = r700AlphaFunc;
1860
1871
 
1861
1872
        functions->Scissor = radeonScissor;
1862
1873
 
1863
 
        functions->DrawBuffer           = radeonDrawBuffer;
1864
 
        functions->ReadBuffer           = radeonReadBuffer;
 
1874
        functions->DrawBuffer = radeonDrawBuffer;
 
1875
        functions->ReadBuffer = radeonReadBuffer;
1865
1876
 
 
1877
        functions->CopyPixels = _mesa_meta_CopyPixels;
 
1878
        functions->DrawPixels = _mesa_meta_DrawPixels;
 
1879
        if (radeon->radeonScreen->kernel_mm)
 
1880
                functions->ReadPixels = radeonReadPixels;
1866
1881
}
1867
1882