Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge commit 'origin/master' into texture_swizzle | Brian Paul | 2009-01-28 | 7 | -25/+35 | |
|\ | ||||||
| * | i965: fix bug in pass0_precalc_mov() | Brian Paul | 2009-01-28 | 1 | -3/+11 | |
| | | | | | | | | | | | | | | Previously, "in-place" swizzles such as: MOV t, t.xxyx; were handled incorrectly. Fixed by splitting the one loop into two loops so we get all the refs before assigning them (to avoid potential clobbering). | |||||
| * | i965: minor comment additions/edits | Brian Paul | 2009-01-28 | 1 | -1/+6 | |
| | | ||||||
| * | i965: remove pad field | Brian Paul | 2009-01-28 | 1 | -1/+0 | |
| | | ||||||
| * | i965: widen per-texture bitfields for 16 texture image units | Brian Paul | 2009-01-28 | 1 | -5/+5 | |
| | | ||||||
| * | i965: minor comments | Brian Paul | 2009-01-28 | 1 | -2/+2 | |
| | | ||||||
| * | dri2: add complaints for more initialization failures. | Eric Anholt | 2009-01-27 | 1 | -3/+9 | |
| | | | | | | | | | | Somehow we're running into DRI2Authenticate failing, and silent demotion to swrast is bad. | |||||
| * | intel: clean up more pf mess. | Eric Anholt | 2009-01-27 | 3 | -11/+3 | |
| | | ||||||
* | | i965: minor improvements in brw_wm_populate_key() | Brian Paul | 2009-01-28 | 1 | -6/+6 | |
| | | ||||||
* | | mesa: additional GL_INVALID_OPERATION tests for texture swizzle | Brian Paul | 2009-01-28 | 1 | -2/+7 | |
| | | ||||||
* | | mesa: implement texture swizzling in swrast | Brian Paul | 2009-01-28 | 4 | -8/+73 | |
| | | | | | | | | And enable GL_EXT_texture_swizzle for software drivers. | |||||
* | | mesa: set/get new state for GL_EXT_texture_swizzle | Brian Paul | 2009-01-28 | 4 | -34/+198 | |
| | | ||||||
* | | mesa: if texObj is NULL in fetch_texel_*(), return black. | Brian Paul | 2009-01-28 | 1 | -20/+32 | |
|/ | ||||||
* | mesa: refactor glTexParameter code | Brian Paul | 2009-01-27 | 1 | -347/+480 | |
| | ||||||
* | mesa: move call to _mesa_update_framebuffer_visual() | Brian Paul | 2009-01-27 | 2 | -1/+3 | |
| | | | | | | | Update the visual info in the _mesa_test_framebuffer_completeness() function when we've determined the FBO to be "complete". Fixes regression seen in progs/demos/shadowtex.c | |||||
* | i915: rename some functions | Brian Paul | 2009-01-26 | 1 | -4/+4 | |
| | ||||||
* | intel: replace i915/intel_state.c and i965/intel_state.c with shared file | Brian Paul | 2009-01-26 | 3 | -466/+235 | |
| | ||||||
* | intel: whitespace changes | Brian Paul | 2009-01-26 | 2 | -118/+118 | |
| | ||||||
* | intel: move some driver functions around | Brian Paul | 2009-01-26 | 4 | -82/+95 | |
| | | | | A step toward consolidating i915/intel_state.c and i965/intel_state.c | |||||
* | intel: check if stencil test is enabled in intel_stencil_drawpixels() | Brian Paul | 2009-01-26 | 1 | -1/+5 | |
| | ||||||
* | intel: save/restore GL matrix mode in ↵ | Brian Paul | 2009-01-26 | 2 | -0/+4 | |
| | | | | intel_meta_set_passthrough_transform(), intel_meta_restore_transform() | |||||
* | intel: asst. casts to silence warnings | Brian Paul | 2009-01-26 | 3 | -5/+7 | |
| | ||||||
* | intel: #include clean-ups | Brian Paul | 2009-01-26 | 1 | -11/+9 | |
| | ||||||
* | intel: remove old #includes | Brian Paul | 2009-01-26 | 1 | -9/+1 | |
| | ||||||
* | intel: make intelUpdateScreenFromSAREA() static | Brian Paul | 2009-01-26 | 2 | -5/+1 | |
| | ||||||
* | intel: remove unused var | Brian Paul | 2009-01-26 | 1 | -2/+0 | |
| | ||||||
* | intel: move intelInitExtensions() and related code into new intel_extensions.c | Brian Paul | 2009-01-26 | 9 | -147/+231 | |
| | ||||||
* | intel: move glClear-related code into new intel_clear.c file | Brian Paul | 2009-01-26 | 8 | -222/+304 | |
| | ||||||
* | intel: Move swap-related functions from intel_buffers.c to new ↵ | Brian Paul | 2009-01-26 | 11 | -222/+301 | |
| | | | | intel_swapbuffers.c | |||||
* | i965: scissor rect was inverted when rendering to texture | Brian Paul | 2009-01-26 | 1 | -4/+14 | |
| | ||||||
* | mesa: add missing texture_put_row_rgb() function in texrender.c | Robert Ellison | 2009-01-26 | 1 | -0/+54 | |
| | | | | | | The wrap_texture() function doesn't set the renderbuffer PutRowRGB() method, which is used to implement DrawPixels(). This fix adds an implementation of this method. | |||||
* | docs: added GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 1 | -0/+1 | |
| | ||||||
* | Merge branch 'tex_combine4' | Brian Paul | 2009-01-23 | 8 | -627/+815 | |
|\ | ||||||
| * | intel: enable GL_NV_texture_env_combine4 extension | Brian Paul | 2009-01-23 | 1 | -0/+1 | |
| | | ||||||
| * | mesa: enable GL_NV_texture_env_combine4 for sw drivers | Brian Paul | 2009-01-23 | 1 | -0/+1 | |
| | | ||||||
| * | mesa: updated fragment shader codegen for GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 1 | -31/+90 | |
| | | | | | | | | | | Expand struct fields, increase loops and handle new 4-term ADD modes. Plus, some new assertions to catch switch/default cases that may be incorrect. | |||||
| * | swrast: updates for GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 2 | -17/+117 | |
| | | ||||||
| * | mesa: update state setup/validation for GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 1 | -7/+18 | |
| | | ||||||
| * | mesa: update glTexEnv(), glGetTexEnv() for GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 1 | -2/+83 | |
| | | ||||||
| * | mesa: initial changes for GL_NV_texture_env_combine4 | Brian Paul | 2009-01-23 | 2 | -10/+9 | |
| | | ||||||
| * | mesa: consolidate glGetTexEnvi/f() code with new get_texenvi() helper | Brian Paul | 2009-01-23 | 1 | -214/+125 | |
| | | ||||||
| * | mesa: refactor _mesa_TexEnvfv() code with helper functions | Brian Paul | 2009-01-23 | 1 | -348/+373 | |
| | | ||||||
* | | i965: init array->Format fields (see bug 19708) | Brian Paul | 2009-01-23 | 1 | -0/+2 | |
| | | ||||||
* | | mesa: set the new array->Format field in VBO code | Brian Paul | 2009-01-23 | 4 | -0/+6 | |
| | | | | | | | | Should help to solve failed assertion in i965 driver (see bug 19708) | |||||
* | | intel: fix the mismerge of the vblank pipe enable sanity check | Jesse Barnes | 2009-01-23 | 1 | -6/+6 | |
| | | | | | | | | Fix the last merge fix, had the blocks ordered incorrectly. | |||||
* | | intel: move pipe enable sanity check to where it belongs | Jesse Barnes | 2009-01-23 | 1 | -8/+8 | |
| | | | | | | | | Bah, applied the patches in the wrong order, not Owain's fault... | |||||
* | | intel: fix vblank crtc selection with DRI1 when only one pipe is enabled. | Owain Ainsworth | 2009-01-23 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | On Mobile chipsets, we often enable PipeB instead of PipeA, but the test in here was insufficient, falling back to pipe A if the area intersection returned zero. Therefore, in the case where a window went off to the top of the left of the screen, it would freeze, waiting on the wrong vblank. Fix this mess by checking the sarea for a crtc being zero sized, and in that case always default to the other one. | |||||
* | | intel: Prevent an "irq is not working" printf when only pipe B is enabled. | Owain G. Ainsworth | 2009-01-23 | 3 | -8/+34 | |
| | | | | | | | | | | | | | | intelMakeCurrent is called before intelWindowMoved (in fact, it calls it), so calculation of the correct vblank crtc has not happened yet. Fix this by making a function that fixes up a set of vblank flags and call if from both functions. | |||||
* | | docs: document improved stencil support and GL_EXT_vertex_array_bgra | Brian Paul | 2009-01-23 | 1 | -0/+4 | |
|/ | ||||||
* | Merge branch 'vertex_array_bgra' | Brian Paul | 2009-01-23 | 7 | -96/+154 | |
|\ |