summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* mesa: remove unused ENABLE_TEXGENx, ENABLE_TEXMATx flagsBrian Paul2009-02-221-23/+8
|
* mesa: assorted clean-ups, var renaming, etc.Brian Paul2009-02-221-59/+59
|
* mesa: simplify texture combine state copying in _mesa_copy_texture_state()Brian Paul2009-02-221-8/+1
| | | | Just copy the whole struct.
* mesa: remove redundant assertions (same asserts in context.c)Brian Paul2009-02-221-3/+0
|
* texmem: fix typo from brianp's changes.Dave Airlie2009-02-221-1/+1
| | | | Reported by cjb via tinderbox on irc
* glapi: update find_entry() for mangled namesBrian Paul2009-02-211-1/+7
|
* mesa: added extern qualifierTom Fogal2009-02-211-1/+1
|
* mesa: use enums for TEXTURE_x_INDEX valuesBrian Paul2009-02-213-40/+28
| | | | | Plus, put them in the order of highest to lowest priority to simplify the texture_override() loop.
* mesa: use an array for current texture objectsBrian Paul2009-02-2116-265/+169
| | | | Use loops to consolidate lots of texture object code.
* mesa: use an array for default texture objectsBrian Paul2009-02-214-90/+72
| | | | | Replace Default1D/2D/3D/Cube/etc with DefaultTex[TEXTURE_x_INDEX]. The same should be done with the Current1D/2D/3D/etc pointers...
* mesa: re-org texgen stateBrian Paul2009-02-2110-568/+295
| | | | New gl_texgen struct allows quite a bit of code reduction.
* intel: Fix intelSetTexBuffer miptree leak.Kristian Høgsberg2009-02-211-2/+7
| | | | The intelImage also holds a reference to the miptree, so unref that as well.
* intel: tell libdrm whether we want a cpu-ready or gpu-ready BO for regions.Eric Anholt2009-02-217-13/+27
| | | | | | | | | | This lets us avoid allocing new buffers for renderbuffers, finalized miptrees, and PBO-uploaded textures when there's an unreferenced but still active one cached, while also avoiding CPU waits for batchbuffers and CPU-uploaded textures. The size of BOs allocated for a desktop running current GL cairogears on i915 is cut in half with this. Note that this means we require libdrm 2.4.5.
* i965: Fix render target read domains.Eric Anholt2009-02-211-2/+1
| | | | | | | | | | | We were asking for something illegal (write_domain != 0 && read_domains != write_domain) because at the time of writing the region surfaces were used for texturing occasionally as well, and we weren't really clear on the model GEM was going to use. This reliably triggered a kernel bug with domain handling, resulting in oglconform mustpass.c failure. Of course, it only became visible after 01bc4d441fd6821ad9fc20d5e9544e4e587e4ff0 cleaned up some gratuitous flushing.
* gallium: use the TGSI_TEXTURE_SHADOW1D/2D/RECT texture types for TEX ↵Brian Paul2009-02-201-9/+30
| | | | | | | | instructions These texture types were defined but never put to use. For the time being though, the Mesa->TGSI translater isn't emitting these targets. See the XXX comment in map_texture_target().
* i965: use the new prog_instruction::TexShadow fieldBrian Paul2009-02-205-6/+11
| | | | | GLSL shadow() sampler calls are properly propogated down to the driver now. The glean glsl1 shadow() tests work (except for the alpha channel).
* i965: check depth_mode in translate_tex_format() for MESA_FORMAT_S8_Z24Brian Paul2009-02-201-1/+9
| | | | | Note that I24X8 vs. A24X8 vs. L24X8 doesn't seem to make any difference for texture/shadow compare, however.
* glsl: use new IR opcodes for TEX instructions with shadow comparisonBrian Paul2009-02-2011-171/+213
| | | | | | Such TEX instructions will have the TexShadow flag set. The gl_program::ShadowSamplers field is now set in the linker. We missed that before.
* mesa: add TexShadow field to prog_instructionBrian Paul2009-02-204-6/+21
| | | | | If the instruction is TEX/TXP/TXL/etc the TexShadow field will be true if the instruction is a texture fetch with shadow compare.
* i965: separate emit_op() and emit_tex_op() functionsBrian Paul2009-02-201-50/+63
|
* mesa: freshen-up comments, move some fields in prog_instructionBrian Paul2009-02-201-25/+15
|
* i965: update comment, use const qualifierBrian Paul2009-02-201-4/+2
|
* i965: var renaming, clean-upBrian Paul2009-02-201-13/+11
|
* i965: added commentBrian Paul2009-02-201-1/+1
|
* intel: fix datatype typo, s/GLboolean/GLuint/Brian Paul2009-02-201-1/+1
| | | | Fixes mysterious failures in glean glsl1 test.
* i965: additional debug outputBrian Paul2009-02-201-0/+8
|
* glsl: rename GLSL texture assembly instructions to be more legibleBrian Paul2009-02-207-321/+327
|
* glsl: fix vec4_texp_rect IR code (need projective version)Brian Paul2009-02-201-1/+1
|
* mesa: support GL_EXT_stencil_two_side in gallium/mesa state trackerBrian Paul2009-02-192-25/+28
| | | | | | | | Since Ian's patch of a few weeks ago, we can enable all three variations of two-sided stencil. Update the state tracker to handle the extra back- face state and turn on the EXT. Note: there's a new Glean test for two-sided stencil now...
* mesa: fix/update/restore comments related to two-sided stencilBrian Paul2009-02-192-2/+19
|
* mesa: initialize ctx->Stencil._BackFace = 1Brian Paul2009-02-191-0/+1
| | | | | | Back-face stencil operations didn't work correctly because this value was zero. It needs to be 1 or 2. The only place it's set otherwise is in glEnable/Disable(GL_STENCIL_TEST_TWO_SIDE_EXT).
* mesa: Free the util shaders with the gallium's FREE.José Fonseca2009-02-193-3/+4
|
* mesa: convert VERT_RESULT_* from #defines to enum, like the othersBrian Paul2009-02-181-21/+24
|
* glsl: asst improvements, clean-ups in set_program_uniform()Brian Paul2009-02-181-27/+36
| | | | | | Move the is_boolean/integer_type() calls out of the loops. Move the is_sampler_type() function near the bool/int functions. Add a bunch of comments.
* glsl: fix inequality in set_program_uniform()Brian Paul2009-02-181-1/+1
| | | | We were off by one when checking for too many uniform values.
* glsl: fix link failure for variable-indexed varying output arraysBrian Paul2009-02-181-0/+25
| | | | | | | | | | | | | | | If the vertex shader writes to a varying array with a variable index, mark all the elements of that array as being written. For example, if the vertex shader does: for (i = 0; i < 4; i++) gl_TexCoord[i] = expr; Mark all texcoord outputs as being written, not just the first. Linking will fail if a fragment shader tries to read an input that's not written by the vertex shader. Before this fix, this linker test could fail.
* swrast: Set vp_override flag during DrawPixelsNicolai Haehnle2009-02-181-0/+11
| | | | | | | | | Obviously, the color of fragments produced by DrawPixels is not constant, even if the current vertex array / vertex program state indicates that the color for normal rendering will be constant. Therefore, we need to override certain optimisations that have been added to texenvprogram.c Signed-off-by: Nicolai Haehnle <[email protected]>
* mesa: improved error msgBrian Paul2009-02-181-1/+2
|
* mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)Brian Paul2009-02-183-5/+22
| | | | | | | | Old limit was 256. Note that no arrays are declared to this size. The only place we have to be careful about raising this limit is the prog_src/dst_register Index bitfields. These have been bumped up too. Added assertions to check we don't exceed the bitfield in the future too.
* glsl: fix a swizzle-related regressionBrian Paul2009-02-181-1/+1
| | | | This new issue was exposed by commit 6eabfc27f19a10dfc2663e99f9560966ba1ff697
* Merge branch 'gallium-texture-transfer'Michel Dänzer2009-02-1810-294/+314
|\ | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_tile_cache.c
| * gallium: fix mergeKeith Whitwell2009-02-161-29/+5
| | | | | | | | | | It looks like I resolved the merge conflicts but did not save my emacs buffers before committing...
| * Merge branch 'master' into gallium-texture-transferKeith Whitwell2009-02-16258-11254/+12591
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_cb_accum.c src/mesa/state_tracker/st_cb_drawpixels.c
| * | gallium: Various coordinate fixups for texture transfers.Michel Dänzer2009-02-133-9/+9
| | | | | | | | | | | | Fixes glReadPixels, gl(Copy)TexSubImage, glCopyPixels.
| * | gallium: Fix GL_DEPTH CopyPixels tile coordinates.Michel Dänzer2009-02-121-1/+1
| | |
| * | gallium: Fix accumulation buffer tile coordinates.Michel Dänzer2009-02-121-5/+5
| | |
| * | gallium: No longer allow CPU mapping surfaces directly.Michel Dänzer2009-02-0510-291/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, a new pipe_transfer object has to be created and mapped for transferring data between the CPU and a texture. This gives the driver more flexibility for textures in address spaces that aren't CPU accessible. This is a first pass; softpipe/xlib builds and runs glxgears, but it only shows a black window. Looks like something's off related to the Z buffer, so the depth test always fails.
* | | util: Move p_debug.h into util module.José Fonseca2009-02-181-1/+1
| | | | | | | | | | | | | | | The debug functions depend on several util function for os abstractions, and these depend on debug functions, so a seperate module is not possible.
* | | mesa: add some debug code to help diagnose incomplete FBO attachments (disabled)Brian Paul2009-02-171-0/+27
| | |
* | | glsl: fix mistake in a commentBrian Paul2009-02-171-1/+1
| | |