Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/mesa_7_7_branch' | Dave Airlie | 2009-11-20 | 1 | -2/+2 |
|\ | |||||
| * | AL1616: Fix cut-and-paste bug | Ian Romanick | 2009-11-17 | 1 | -2/+2 |
| | | | | | | | | | | One of the PACK_COLOR_88 cases was left over from copying _mesa_texstore_al88 to _mesa_texstore_al1616. | ||||
* | | mesa: Remove gratuitous padding in prog_dst_register. | Eric Anholt | 2009-11-19 | 1 | -1/+0 |
| | | | | | | | | | | | | | | The padding was there to indicate the amount of space left from the number of expected bytes in the struct minus allocated bits. But uint bitfields get packed so that they don't cross uint boundaries, and we ended up allocating an extra dword to hold the pad field! | ||||
* | | mesa: bump version to 7.8 | Brian Paul | 2009-11-18 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'outputswritten64' | Ian Romanick | 2009-11-17 | 5 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add a GLbitfield64 type and several macros to operate on 64-bit fields. The OutputsWritten field of gl_program is changed to use that type. This results in a fair amount of fallout in drivers that use programs. No changes are strictly necessary at this point as all bits used are below the 32-bit boundary. Fairly soon several bits will be added for clip distances written by a vertex shader. This will cause several bits used for varyings to be pushed above the 32-bit boundary. This will affect any drivers that support GLSL. At this point, only the i965 driver has been modified to support this eventuality. I did this as a "squash" merge. There were several places through the outputswritten64 branch where things were broken. I foresee this causing difficulties later for bisecting. The history is still available in the branch. Conflicts: src/mesa/drivers/dri/i965/brw_wm.h | ||||
* | ARB_fbo: Enable GL_EXT_framebuffer_multisample | Ian Romanick | 2009-11-17 | 2 | -2/+7 |
| | | | | | | | | All of this functionality is already included in ARB_fbo. This just enables the string. I was a bit lazy in using FEATURE_ARB_framebuffer_object for this feature as well. I don't think it makes much difference in the long run. | ||||
* | ARB_fbo: Regenerate files from previous commits. | Ian Romanick | 2009-11-17 | 2 | -3764/+3810 |
| | |||||
* | EXT_pds: Alias GL_NV_packed_depth_stencil to GL_EXT_packed_depth_stencil | Ian Romanick | 2009-11-17 | 1 | -0/+1 |
| | | | | | | GL_EXT_packed_depth_stencil is a functional superset of GL_NV_packed_depth_stencil. If a driver enables EXT_pds, make NV_pds available as well. | ||||
* | mesa: remove old comment | Brian Paul | 2009-11-17 | 1 | -1/+0 |
| | |||||
* | mesa: fix incorrect type in store_texel_al1616() | Brian Paul | 2009-11-17 | 1 | -1/+1 |
| | |||||
* | mesa: remove trailing comment to silence warning | Brian Paul | 2009-11-17 | 1 | -1/+1 |
| | |||||
* | mesa: remove a bit of old code | Brian Paul | 2009-11-17 | 1 | -1/+0 |
| | |||||
* | Add MESA_FORMAT_XRGB8888_REV. | Michel Dänzer | 2009-11-17 | 5 | -3/+49 |
| | |||||
* | Move 'static' to start of declaration to silence compiler warning | Ian Romanick | 2009-11-16 | 1 | -1/+1 |
| | |||||
* | AL1616: Enable MESA_FORMAT_AL1616 for software paths | Ian Romanick | 2009-11-16 | 1 | -2/+4 |
| | |||||
* | AL1616: Add TexImage storage path | Ian Romanick | 2009-11-16 | 1 | -0/+73 |
| | |||||
* | AL1616: Add texel fetch / store routines | Ian Romanick | 2009-11-16 | 2 | -0/+62 |
| | |||||
* | AL1616: Add formats for GL_LUMINANCE16_ALPHA16 textures | Ian Romanick | 2009-11-16 | 2 | -0/+27 |
| | |||||
* | AL1616: Add macros to pack two GLushorts into a texel | Ian Romanick | 2009-11-16 | 1 | -0/+6 |
| | |||||
* | mesa: remove unused vertex array driver hooks | Brian Paul | 2009-11-16 | 2 | -104/+26 |
| | |||||
* | mesa: check BaseLevel, MaxLevel in _mesa_GenerateMipmapEXT() | Brian Paul | 2009-11-16 | 1 | -0/+5 |
| | |||||
* | mesa: use _mesa_get_current_tex_object() | Brian Paul | 2009-11-16 | 1 | -3/+1 |
| | |||||
* | mesa: added another check in check_gen_mipmap() | Brian Paul | 2009-11-16 | 1 | -1/+3 |
| | | | | | We don't need to call ctx->Driver.GenerateMipmap() if we're updating a texture level >= MAX_LEVEL. | ||||
* | mesa: fix some begin/end render-to-texture logic | brian | 2009-11-10 | 1 | -21/+38 |
| | | | | | | | | | Before, we weren't aggressive enough in checking for the start or end of render-to-texture. In particular, if only the ctx->ReadBuffer had texture attachments, we were treating that as a render-to-texture case. This fixes a regression from commit 75bdbdd90b15c8704d87ca195a364ff6a42edbb1 "intel: Don't validate in a texture image used as a render target." | ||||
* | mesa: move check_begin/end_texture_render() calls | brian | 2009-11-10 | 1 | -9/+11 |
| | |||||
* | mesa: new vars: oldDrawFb, oldReadFb in _mesa_BindFramebufferEXT() | brian | 2009-11-10 | 1 | -3/+7 |
| | |||||
* | mesa: rename vars in _mesa_BindFramebufferEXT() | brian | 2009-11-10 | 1 | -22/+21 |
| | |||||
* | mesa: added comment for check_begin_texture_render() | brian | 2009-11-10 | 1 | -0/+5 |
| | |||||
* | mesa: Attempt to pair up Driver.RenderTexture and FinishRenderTexture() | Eric Anholt | 2009-11-06 | 1 | -0/+4 |
| | | | | | | | | | | This is probably not 100% complete (bind vs unbind may still not pair up exactly), but it should help out drivers which are relying on FinishRenderTexture to be called when we're done rendering to a particular texture level, not just when we're done rendering to the object at all. This is the case for the one consumer of FinishRenderTexture() so far: the gallium state tracker. Noticed when trying to make use of FRT() in the intel driver. | ||||
* | Merge branch 'mesa_7_6_branch' | Ian Romanick | 2009-11-06 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the memory leaks in the assembly parser without the regressions. The conflicts in program_lexer.l were related to changes in returning strings between the branches (always return IDENTIFIER vs. returing either IDENTIFIER or USED_IDENTIFIER). The conflicts in program_parse.y were related to two changes in master One change prints a variable name in an error message. The other change adds outputVarSize to the OUTPUT_statement rule. The cause the position of the IDENTIFIER to change from $2 to $3. Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_lexer.l src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.y | ||||
| * | mesa: added cast to silence warning | Brian Paul | 2009-11-04 | 1 | -1/+1 |
| | | |||||
* | | mesa: fix infinite loop bug in _mesa_drawbuffers() | Brian Paul | 2009-11-05 | 1 | -1/+2 |
| | | | | | | | | | | Fixes bug 24946. This regression came from 8df699b3bb1aa05b633f05b121d09d812c86a22d. | ||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-11-04 | 4 | -178/+179 |
|\| | | | | | | | | | | | Conflicts: src/mesa/drivers/windows/gdi/mesa.def | ||||
| * | mesa: fix broken pack_histogram() case for GLhalf | Brian Paul | 2009-11-04 | 1 | -3/+4 |
| | | |||||
| * | mesa: silence warning from gcc 4.4.1 | Brian Paul | 2009-11-04 | 1 | -2/+2 |
| | | |||||
| * | mesa: (GLint64) casts in get.c to silence Visual Studio warnings | Brian Paul | 2009-11-03 | 2 | -173/+173 |
| | | | | | | | | Revised version of a patch from Karl Schultz. | ||||
| * | mesa: added GLAPIENTRY keywords for sync object functions | Karl Schultz | 2009-11-03 | 2 | -12/+12 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
* | | mesa: clean-up, remove some flushing in FBO functions | Brian Paul | 2009-11-03 | 1 | -7/+11 |
| | | | | | | | | | | Remove some unneeded flushes. Replace FLUSH_CURRENT w/ FLUSH_VERTICES in other places. | ||||
* | | mesa: fix indentation | Brian Paul | 2009-11-03 | 1 | -2/+1 |
| | | |||||
* | | mesa: clean-up formatting | Brian Paul | 2009-11-03 | 1 | -1/+1 |
| | | |||||
* | | mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT() | Brian Paul | 2009-11-03 | 1 | -7/+10 |
| | | |||||
* | | mesa: use FLUSH_VERTICES() in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -1/+1 |
| | | |||||
* | | mesa: avoid extraneous _NEW_BUFFER state in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -9/+29 |
| | | |||||
* | | mesa: use ffs() to shorten loop in _mesa_drawbuffers() | Brian Paul | 2009-11-03 | 1 | -6/+10 |
| | | |||||
* | | mesa: added assertion, another comment | Brian Paul | 2009-11-03 | 1 | -1/+3 |
| | | |||||
* | | mesa: added comment | Brian Paul | 2009-11-02 | 1 | -0/+2 |
| | | |||||
* | | mesa: use _mesa_get_current_tex_object() | Brian Paul | 2009-11-02 | 1 | -13/+4 |
| | | |||||
* | | mesa: make _mesa_get_current_tex_objec() public | Brian Paul | 2009-11-02 | 2 | -31/+33 |
| | | |||||
* | | mesa: fix incorrect approx bits/channel for fxt1 formats | Brian Paul | 2009-11-02 | 1 | -2/+2 |
| | | | | | | | | See bug 24806. | ||||
* | | mesa: better error message | Brian Paul | 2009-10-30 | 1 | -2/+2 |
| | |