summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gallium-texture-transferKeith Whitwell2009-02-16554-30435/+29935
|\ | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_cb_accum.c src/mesa/state_tracker/st_cb_drawpixels.c
| * mesa: remove old commentsBrian Paul2009-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the default value for EmitCondCodes is FALSE. This means the GLSL compiler will emit code like this: SEQ TEMP[0].x, A, B; IF TEMP[0].x; ... ENDIF But if EmitCondCodes is TRUE, condition codes will be used instead: SEQ.C TEMP[0].x, A, B; IF (NE.xxxx); ... ENDIF
| * i965: tell GLSL compiler to emit code using condition codesBrian Paul2009-02-161-0/+3
| | | | | | | | | | | | The default for EmitCondCodes got flipped when gallium-0.2 was merged. This fixes GLSL if/else/endif regressions. Drivers that use GLSL should always explicitly set the flag to be safe.
| * nouveau: oops :-)Patrice Mandin2009-02-161-2/+2
| |
| * autoconf: Always enable glewDan Nicholson2009-02-161-2/+2
| | | | | | | | | | Maybe this should turn into an option (--disable-glew), but for now just enable glew all the time.
| * glsl: silence some uninit var warningsBrian Paul2009-02-162-2/+2
| |
| * cell: use some SPU intrinsics to get slightly better code in eval_inputs()Brian Paul2009-02-161-4/+7
| | | | | | | | Suggested by Jonathan Adamczewski. There may be more places to do this...
| * r300-gallium: Add verbosity level to debugging.Corbin Simpson2009-02-162-7/+12
| | | | | | | | Makes it a bit more manageable to read through the console logs.
| * r300-gallium: Fix BEGIN_CS and END_CS counting and mismatch.Corbin Simpson2009-02-163-6/+4
| |
| * r300-gallium: Set up draw rasterizer.Corbin Simpson2009-02-162-2/+10
| |
| * demos: fix glxpixmap and call glXWaitGL before calling XCopyArea.Alan Hourihane2009-02-161-0/+1
| |
| * dri2: support glXWaitX & glXWaitGL by using fake front buffer.Alan Hourihane2009-02-164-6/+81
| |
| * r300-gallium: Ooops, forgot to apply this stash.Corbin Simpson2009-02-162-0/+22
| | | | | | | | "git stash": The cause of, and solution to, all my problems.
| * r300-gallium: Include-guard r300_emit.hCorbin Simpson2009-02-161-0/+9
| |
| * r300-gallium: Add draw_arrays and friends.Corbin Simpson2009-02-165-24/+138
| | | | | | | | | | | | This is the last bit of Gallium-side plumbing for drawing things. From this point on, the only missing parts should be in r3xx-specific code areas...
| * r300-gallium: Add SC_CLIP_RULE to clear.Corbin Simpson2009-02-161-0/+3
| | | | | | | | | | This is a register that is in r300_demo but not r300_surface, so adding it in to see if it helps.
| * cell: minor Makefile clean-upBrian Paul2009-02-151-2/+3
| |
| * cell: new/tighter code for computing fragment program inputsBrian Paul2009-02-151-91/+76
| |
| * cell: combine eval_z(), eval_w() functionsBrian Paul2009-02-151-20/+27
| |
| * r300-gallium: Fix scissors.Corbin Simpson2009-02-155-20/+29
| | | | | | | | | | Don't use SCISSORS_OFFSET since we're DRI2, and don't forget to set scissors in clear.
| * r300-gallium: Grab bag of goodies.Corbin Simpson2009-02-154-22/+55
| | | | | | | | | | Some fixes from glisse, moar swtcl emit setup, cleanup a bunch of regs, properly do clear flush, and BEGIN_CS count fixes.
| * r300-gallium: Clean up some clear registers.Corbin Simpson2009-02-151-7/+3
| |
| * r300-gallium: Use fui instead of a roll-my-own.Corbin Simpson2009-02-151-13/+3
| | | | | | | | Man, util/u_math just gets better by the day.
| * r300: Redirect constant TEX coordinatesNicolai Haehnle2009-02-142-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | R3xx/R5xx fragment program texture constants must come from a hardware register instead of the constant file, so we redirect if necessary during the native rewrite phase. The symptoms of this bug started appearing when the Mesa fixed function texenvprogram code started using STATE_CURRENT_ATTRIB constants for texture coordinates when the corresponding attributes were constant across all vertices. Signed-off-by: Nicolai Haehnle <[email protected]>
| * radeon-gallium: Clean out extensions explicitly enabled by Mesa.Corbin Simpson2009-02-141-36/+2
| | | | | | | | | | | | This cleans up some of the cruft from the old DRI setup, and it turns out that only the GLSL extensions are still off if we let st_extensions.c handle the setup instead.
| * r300-gallium: Update r300_screen comments and add a few formats.Corbin Simpson2009-02-141-3/+15
| |
| * r300-gallium: Enable all four colorbuffer render targets.Corbin Simpson2009-02-141-2/+1
| | | | | | | | | | As far as I can tell all the state emission necessary has been set up. Well, except for the fragment shader, but c'mon, gimme a break. :3
| * r300-gallium: Add Z/stencil buffer format emit.Corbin Simpson2009-02-141-2/+8
| | | | | | | | Also set BEGIN_CS correctly.
| * r300-gallium: Emit Z/stencil buffer offset.Corbin Simpson2009-02-141-0/+13
| |
| * r300-gallium: Add derived state for vertex formats.Corbin Simpson2009-02-134-11/+161
| | | | | | | | Next up: The evil RS block.
| * i965: rewrite the code for handling shader subroutine callsBrian Paul2009-02-136-64/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the prog_instruction::Data field was used to map original Mesa instructions to brw instructions in order to resolve subroutine calls. This was a rather tangled mess. Plus it's an obstacle to implementing dynamic allocation/growing of the instruction buffer (it's still a fixed size). Mesa's GLSL compiler emits a label for each subroutine and CAL instruction. Now we use those labels to patch the subroutine calls after code generation has been done. We just keep a list of all CAL instructions that needs patching and a list of all subroutine labels. It's a simple matter to resolve them. This also consolidates some redundant post-emit code between brw_vs_emit.c and brw_wm_glsl.c and removes some loops that cleared the prog_instruction::Data fields at the end. Plus, a bunch of new comments.
| * i965: add missing break for OPCODE_RET caseBrian Paul2009-02-131-0/+1
| | | | | | | | This doesn't effect correctness, but we were emitting an extraneous ADD.
| * i965: the return value of translate_insn() is never used. Make it void.Brian Paul2009-02-131-4/+3
| |
| * i965: minor clean-upsBrian Paul2009-02-131-27/+26
| |
| * i965: code clean-ups, comments, and minor refactoringBrian Paul2009-02-132-37/+65
| |
| * i965: updated commentsBrian Paul2009-02-131-17/+37
| |
| * intel: turn on GL_ARB_shading_language_120Brian Paul2009-02-131-4/+0
| | | | | | | | | | It's done in the Mesa GLSL compiler. The only part of it that might matter in drivers is the centroid sampling option for MSAA.
| * i965: more reformatting/clean-upBrian Paul2009-02-131-12/+10
| |
| * i965: s/__inline/INLINE/Brian Paul2009-02-131-4/+4
| |
| * i965: formatting and indentation fixesBrian Paul2009-02-131-17/+16
| |
| * i965: fix inconsistant indentation in brw_wm.cBrian Paul2009-02-131-37/+39
| |
| * i965: Eric Anholt's patch for bumping up texture sizesRobert Ellison2009-02-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | I'm committing this because it fixes a conform failure; the failure occurs on the TextureProxy test, where the test attempts to create proxy textures at every level, but fails at the last level (border == 1, width == 1, height == 1) because it's beyond MAX_TEXTURE_LEVELS. Eric's original comment was: idr said that in his review swrast was ready for it, and the 965 driver is advertising it already though it has been resulting in many crashes due to arrays using these defines not being big enough.
| * r300-gallium: Various thingies.Corbin Simpson2009-02-136-55/+34
| | | | | | | | | | Add formats to framebuffer emit, fix up shader function names, make sure fragment format is emitted for r500.
| * Add dummy install target for glew to fix 'make install'Dan Nicholson2009-02-131-0/+3
| | | | | | | | Signed-off-by: Dan Nicholson <[email protected]>
| * autoconf: Add GLEW needed by progs when building GLUTDan Nicholson2009-02-131-1/+1
| | | | | | | | Signed-off-by: Dan Nicholson <[email protected]>
| * mesa: check if TNL state is null in _tnl_free_vertices() to avoid potential ↵Brian Paul2009-02-131-21/+24
| | | | | | | | | | | | | | | | | | segfault _tnl_free_vertices() is called from several places during context tear-down. Depending on the order in which the swrast, swrast_setup and tnl context is destroyed we could hit a null pointer here. This doesn't seem to be an actual issue with any Mesa drivers, but let's be safe.
| * mesa: add additional texture size/limit assertionsBrian Paul2009-02-131-5/+13
| |
| * egl: Doesn't depend on xorg or pixmanJakob Bornecrantz2009-02-121-1/+0
| |
| * r300-gallium: Take care of various bad dereferences in shader setup.Corbin Simpson2009-02-123-11/+25
| | | | | | | | Unbreaks glxinfo.
| * r300-gallium: Fix linker error a few linker warnings.Corbin Simpson2009-02-122-1/+12
| | | | | | | | A few prototypes, a missing header, a misspelled macro.