Dave Airlie [Thu, 22 Jan 2009 14:23:10 +0000 (00:23 +1000)]
r200: disable some debug
Dave Airlie [Thu, 22 Jan 2009 14:17:38 +0000 (00:17 +1000)]
r200: emit elts into a separate ELT bo
Dave Airlie [Wed, 21 Jan 2009 16:53:30 +0000 (02:53 +1000)]
r200r300: start merging span code
Dave Airlie [Wed, 21 Jan 2009 16:38:00 +0000 (02:38 +1000)]
r200: remove indexed verts
Dave Airlie [Wed, 21 Jan 2009 15:24:50 +0000 (01:24 +1000)]
radeon: fix 1D textures
Dave Airlie [Wed, 21 Jan 2009 15:17:31 +0000 (01:17 +1000)]
r200: fix cubemaps
Dave Airlie [Wed, 21 Jan 2009 15:05:43 +0000 (01:05 +1000)]
r200/r300: port r200 texture handling to common code
we now get texrect + trivial textures working
Dave Airlie [Wed, 21 Jan 2009 08:41:11 +0000 (18:41 +1000)]
r300/radeon: move face_for_target
Dave Airlie [Tue, 20 Jan 2009 16:21:45 +0000 (02:21 +1000)]
r300: start migrating common functions into common code
Dave Airlie [Tue, 20 Jan 2009 16:15:28 +0000 (02:15 +1000)]
r300: move to common texture_image object
Dave Airlie [Tue, 20 Jan 2009 16:10:32 +0000 (02:10 +1000)]
radeon/r200/r300: start to move to common miptree/texobj
Dave Airlie [Tue, 20 Jan 2009 15:40:33 +0000 (01:40 +1000)]
r200: make tri render on my r200.
Dave Airlie [Tue, 20 Jan 2009 12:59:34 +0000 (22:59 +1000)]
r200: tri runs without crashing - doesn't draw anything
Dave Airlie [Tue, 20 Jan 2009 12:51:04 +0000 (22:51 +1000)]
r200: clear is working at least - not much else
Dave Airlie [Thu, 15 Jan 2009 06:50:58 +0000 (16:50 +1000)]
r300: move some more function to generic
Dave Airlie [Thu, 15 Jan 2009 06:41:01 +0000 (16:41 +1000)]
radeon/r200/r300: start to make cmd buf useful
Dave Airlie [Thu, 15 Jan 2009 06:25:37 +0000 (16:25 +1000)]
r100/r200: move to new atom style emission
Dave Airlie [Wed, 14 Jan 2009 05:54:28 +0000 (15:54 +1000)]
radeon: get ctx right in copybuffer
Dave Airlie [Wed, 14 Jan 2009 05:48:02 +0000 (15:48 +1000)]
r200: add missing symbols
Dave Airlie [Wed, 14 Jan 2009 05:45:29 +0000 (15:45 +1000)]
radeon/r200/r300: make legacy emit non-r300 specific
Dave Airlie [Wed, 14 Jan 2009 05:21:45 +0000 (15:21 +1000)]
radeon: move debug symbol add DRI2
Dave Airlie [Wed, 14 Jan 2009 05:12:57 +0000 (15:12 +1000)]
r300: start moving new r300 cmdbuf into common code
Dave Airlie [Wed, 14 Jan 2009 03:38:12 +0000 (13:38 +1000)]
radeon/r200/r300: consolidate swap buffers
Dave Airlie [Wed, 14 Jan 2009 03:38:03 +0000 (13:38 +1000)]
radeon: remove old lock code
Dave Airlie [Wed, 14 Jan 2009 03:23:24 +0000 (13:23 +1000)]
radeon/r200/r300: consolidate the buffer copy/flip code into one place
Dave Airlie [Wed, 14 Jan 2009 02:04:00 +0000 (12:04 +1000)]
radeon/r200/r300: attempt to move lock to common code
Dave Airlie [Wed, 14 Jan 2009 00:44:48 +0000 (10:44 +1000)]
radeon/r200/r300: initial attempt to convert to common context code
Dave Airlie [Tue, 13 Jan 2009 22:40:15 +0000 (08:40 +1000)]
radeon/r200: move more stuff closer together in context
Dave Airlie [Tue, 13 Jan 2009 20:28:43 +0000 (06:28 +1000)]
radeon/r200: move state atom to common header
Dave Airlie [Tue, 13 Jan 2009 12:55:27 +0000 (22:55 +1000)]
radeon/r200: start splitting out commonalities into separate headers
Dave Airlie [Tue, 13 Jan 2009 06:50:15 +0000 (16:50 +1000)]
radeon: use bo_wait to wait for all buffers to be rendered to
Not 100% sure this is correct, but its what Intel does and its better than
CP_IDLE.
Kristian Høgsberg [Tue, 2 Dec 2008 02:44:03 +0000 (21:44 -0500)]
Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol.
(cherry picked from commit
154a9e5317f890618932cea0129ef887e16baf84)
Dave Airlie [Sat, 10 Jan 2009 23:47:38 +0000 (09:47 +1000)]
radeon/r300: add code to setup r300 vs r500 using pci device from kernel
Dave Airlie [Mon, 22 Dec 2008 07:04:39 +0000 (17:04 +1000)]
r300: disable settexoffset extension on r300
Dave Airlie [Mon, 22 Dec 2008 02:28:16 +0000 (12:28 +1000)]
radeon: fix library name for consistency
Dave Airlie [Mon, 22 Dec 2008 01:41:32 +0000 (11:41 +1000)]
radeon: remove start/end offset + cleanup some whitespace
Dave Airlie [Mon, 22 Dec 2008 01:41:23 +0000 (11:41 +1000)]
radeon: fixup r500 FP emission for new CS
Dave Airlie [Sat, 20 Dec 2008 23:54:35 +0000 (09:54 +1000)]
radeno: hopefully make r200/radeon build
Dave Airlie [Mon, 1 Dec 2008 06:24:50 +0000 (16:24 +1000)]
radeon: make DRI1 one work with new CS mechanism
Jerome Glisse [Sun, 16 Nov 2008 16:59:46 +0000 (17:59 +0100)]
radeon: cs add print cs callback
Jerome Glisse [Sun, 16 Nov 2008 16:58:43 +0000 (17:58 +0100)]
radeon: fix pointer dangling
Jerome Glisse [Sat, 15 Nov 2008 09:40:32 +0000 (10:40 +0100)]
radeon: update to libdrm-radeon API changes
Jerome Glisse [Fri, 14 Nov 2008 10:25:28 +0000 (11:25 +0100)]
radeon: dri2 don't forget to free buffer
Jerome Glisse [Thu, 13 Nov 2008 19:04:50 +0000 (20:04 +0100)]
r300: release bo from pixmap
Jerome Glisse [Wed, 12 Nov 2008 16:00:28 +0000 (17:00 +0100)]
r300: convert to new relocations format (see libdrm-radeon)
Jerome Glisse [Wed, 12 Nov 2008 13:02:57 +0000 (14:02 +0100)]
r300: SetTex extension support
Jerome Glisse [Sun, 9 Nov 2008 18:00:28 +0000 (19:00 +0100)]
r300: cs + DRI2 support
If DRI2 is enabled then switch cmd assembly to directly build
hw packet.
Jerome Glisse [Wed, 5 Nov 2008 13:31:46 +0000 (14:31 +0100)]
r300: bo and cs abstraction.
This abstract memory management and command stream building so we
can use different backend either legacy one which use old pathway
or a new one like with a new memory manager. This works was done by :
Nicolai Haehnle
Dave Airlie
Jerome Glisse
Brian Paul [Fri, 14 Nov 2008 01:18:07 +0000 (18:18 -0700)]
mesa: no longer need Writemask field in GLSL IR nodes
The Swizzle and Size fields carry all the info we need now.
Brian Paul [Fri, 14 Nov 2008 00:02:11 +0000 (17:02 -0700)]
mesa: revamp GLSL instruction emit code
This is a step toward better array handling code. In particular, when more
than one operand of an instruction uses indirect addressing, we'll need some
temporary instructions and registers. By converting IR storage to instruction
operands all in one place (emit_instruction()) we can be smarter about this.
Also, somewhat better handling of dst register swizzle/writemask handling.
This results in tighter writemasks on some instructions which is good for
SOA execution.
And, cleaner instruction commenting with inst_comment().
Next: remove some more dead code and additional clean-ups...
Brian Paul [Thu, 13 Nov 2008 23:37:52 +0000 (16:37 -0700)]
mesa: make writemask_string() non-static
Brian Paul [Thu, 13 Nov 2008 23:31:27 +0000 (16:31 -0700)]
mesa: remove some do-nothing GLSL code
Brian Paul [Thu, 13 Nov 2008 15:47:36 +0000 (08:47 -0700)]
mesa: fix accidental regression in GLSL built-in texture matrix lookup
Was broken by commit
9aca9a4b72b2a7b378e50bd88f9c3324d07375ec.
Brian Paul [Thu, 13 Nov 2008 15:46:45 +0000 (08:46 -0700)]
mesa: use the tighter definition of GLSL ftransform() from the gallium branches
Brian Paul [Wed, 12 Nov 2008 23:47:03 +0000 (16:47 -0700)]
mesa: remove unused/obsolete __NormalMatrixTranspose matrix
Brian Paul [Wed, 12 Nov 2008 23:44:47 +0000 (16:44 -0700)]
mesa: fix bug in GLSL built-in matrix state lookup
Brian Paul [Wed, 12 Nov 2008 18:12:10 +0000 (11:12 -0700)]
mesa: tweak program register printing for RelAddr case
Alan Hourihane [Thu, 13 Nov 2008 13:16:03 +0000 (13:16 +0000)]
mesa: fix generation of fixed function state when no vp exists
Eric Anholt [Wed, 12 Nov 2008 21:37:16 +0000 (13:37 -0800)]
i965: Upload state on primitive switch, don't just prepare it.
This was a regression in
59b2c2adbbece27ccf54e58b598ea29cb3a5aa85 that broke
blender, among other apps.
Eric Anholt [Wed, 12 Nov 2008 21:34:20 +0000 (13:34 -0800)]
i965: Fix VB refcount leak on aperture overflow.
Eric Anholt [Tue, 4 Nov 2008 20:34:29 +0000 (12:34 -0800)]
Add glsync demo program from jbarnes for testing vblank synchronization.
Eric Anholt [Mon, 3 Nov 2008 02:50:59 +0000 (18:50 -0800)]
i965: Fix up VS max_threads for G4X and removing a magic number.
As far as I can read in the docs, VS threads can be 1:1 with the pairs of
VUE handles allocated for them. Also, G4X can run twice as many threads as
before (though we won't unless the we bump the preferred URB entries for VS).
Eric Anholt [Mon, 3 Nov 2008 02:49:33 +0000 (18:49 -0800)]
i965: Fix up SF max_threads.
We were dividing the number of URB entries by two to get number of threads,
which looks suspiciously like a copy'n'paste-o from brw_vs_state.c. Also, the
maximum number of threads is 24, not 12.
Eric Anholt [Mon, 3 Nov 2008 02:43:10 +0000 (18:43 -0800)]
i965: Fix up clip min_nr_entries, preferred_nr_entries, and max_threads.
The clip thread could potentially deadlock when processing tristrips since
being moved back to dual-thread mode, as the two threads could each have 4 VUEs
referenced and not be able to allocate another one since SF processing
wasn't able to continue (needing 5 entries before it freed 2).
In constrained URB mode, similar deadlock could even have occurred with
polygons (so we cut back max_threads if we can't handle it any primitive type).
Eric Anholt [Mon, 3 Nov 2008 02:42:17 +0000 (18:42 -0800)]
i965: Update WM maximum threads for G4X.
Eric Anholt [Mon, 3 Nov 2008 02:48:25 +0000 (18:48 -0800)]
i965: Add a big comment explaining my understanding of URB management.
It shouldn't offer anything new over what's in the docs (except for G4X notes),
but here it's all in one place.
Kristian Høgsberg [Wed, 12 Nov 2008 20:24:45 +0000 (15:24 -0500)]
glFlush before CopySubBuffer, fix coordinates and extension name typo.
Hanno Böck [Wed, 12 Nov 2008 13:56:42 +0000 (06:56 -0700)]
glx: fix xcb build
Brian Paul [Tue, 11 Nov 2008 21:33:11 +0000 (14:33 -0700)]
mesa: fix version check in dinoshade.c
Brian Paul [Tue, 11 Nov 2008 17:47:10 +0000 (10:47 -0700)]
mesa: allow relative indexing into all register files and indirect dst register indexing
Kristian Høgsberg [Tue, 11 Nov 2008 18:39:52 +0000 (13:39 -0500)]
Don't mess with emacs tab width.
Xiang, Haihao [Tue, 11 Nov 2008 05:42:13 +0000 (13:42 +0800)]
intel: reset cliprect_mode to IGNORE_CLIPRECTS.
This ensures all batchbuffers have a same cliprect mode after calling
_intel_batchbuffer_flush even if there aren't invalid commands in the
current batch buffer. (fix bug#18362).
Xiang, Haihao [Tue, 11 Nov 2008 05:36:32 +0000 (13:36 +0800)]
mesa: restore the negate flag of dots in build_lighting.
Dots is re-used if more than one light is enabled. Previously
the negate flag of dots may affect next light.
Xiang, Haihao [Tue, 11 Nov 2008 05:16:20 +0000 (13:16 +0800)]
mesa: update new state for RasterPos like other operations.
This fixes a lighting issue when drawing a bitmap.
Brian [Tue, 11 Nov 2008 03:15:28 +0000 (20:15 -0700)]
mesa: new _mesa_is_pow_two() function
Brian Paul [Mon, 10 Nov 2008 23:38:47 +0000 (16:38 -0700)]
mesa: restore glapi/ prefix on #include
Brian Paul [Mon, 10 Nov 2008 21:42:02 +0000 (14:42 -0700)]
mesa: fix some misc breakage caused by editing auto-generated files rather than the python generators
Specifically:
#include "glapitable.h" in src/mesa/main/glapi/dispatch.h
Call _mesa_bsearch() in src/mesa/main/enums.c.
Brian Paul [Mon, 10 Nov 2008 21:27:42 +0000 (14:27 -0700)]
GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident()
See bug 18445.
When getting array results, __glXReadReply() always reads a multiple of
four bytes. This can cause writing to invalid memory when 'n' is not a
multiple of four.
Special-case the glAreTexturesResident() functions now.
To fix the bug, we use a temporary buffer that's a multiple of four bytes
in length.
NOTE: this commit also reverts part of commit
919ec22ecf72aa163e1b97d8c7381002131ed32c
(glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which
directly edited the indirect.c file rather than the python generator!
I'm not repairing that issue at this time.
Brian Paul [Mon, 10 Nov 2008 19:37:08 +0000 (12:37 -0700)]
dri: alloc __DRIscreen object with calloc()
Brian Paul [Mon, 10 Nov 2008 19:33:17 +0000 (12:33 -0700)]
mesa: track initialization status of uniform variables. Plus, asst clean-ups.
Brian Paul [Mon, 10 Nov 2008 18:42:42 +0000 (11:42 -0700)]
mesa: initial support for uniform variable initializers.
This lets one specify initial values for uniforms in the code, avoiding
the need to call glUniform() in some cases.
Brian Paul [Mon, 10 Nov 2008 17:45:50 +0000 (10:45 -0700)]
mesa: fix logic error in GLSL linker when looking for main() shaders
Brian Paul [Mon, 10 Nov 2008 17:25:01 +0000 (10:25 -0700)]
mesa: allows 'f' suffix on GLSL float literals
Brian Paul [Mon, 10 Nov 2008 17:21:13 +0000 (10:21 -0700)]
undo accidental changes to multitex.frag shader
Brian [Sat, 8 Nov 2008 17:33:30 +0000 (10:33 -0700)]
mesa: remove OPCODE_INT #define
Brian [Sat, 8 Nov 2008 17:29:03 +0000 (10:29 -0700)]
mesa: use NRM3 in emit_normalize_vec3() when drivers are ready
Brian Paul [Fri, 7 Nov 2008 23:08:21 +0000 (16:08 -0700)]
mesa: add support for 'centroid' qualifier in GLSL 1.20
Brian Paul [Fri, 7 Nov 2008 22:51:10 +0000 (15:51 -0700)]
mesa: add support for 'invariant' keyword for GLSL 1.20
Brian Paul [Fri, 7 Nov 2008 21:28:00 +0000 (14:28 -0700)]
mesa: reformat comments, rewrap lines, etc for a little better readability
Brian Paul [Fri, 7 Nov 2008 19:59:36 +0000 (12:59 -0700)]
mesa: forgot sqrt in NRM3/4 instructions
Brian Paul [Fri, 7 Nov 2008 19:59:08 +0000 (12:59 -0700)]
mesa: fix opcode table order bug
Brian Paul [Fri, 7 Nov 2008 16:49:26 +0000 (09:49 -0700)]
mesa: add GLSL support for DP2, NRM3, NRM4 instructions (not actually emitted yet though)
Brian Paul [Fri, 7 Nov 2008 16:41:00 +0000 (09:41 -0700)]
mesa: added DP2, DP2A instructions
Brian Paul [Fri, 7 Nov 2008 16:33:55 +0000 (09:33 -0700)]
mesa: added AND/OR/NOT/XOR instructions
Brian Paul [Fri, 7 Nov 2008 16:06:09 +0000 (09:06 -0700)]
mesa: include shader/prog_instruction.h
Seems to fix a mysteriously missing build dependency.
Brian Paul [Fri, 7 Nov 2008 15:51:31 +0000 (08:51 -0700)]
mesa: added OPCODE_NRM3/NRM4 instructions for vector normalization.
We may emit these instructions from GLSL instead of DP3/RCP/MUL.
Also, implement SSG (set sign) instruction in the interpreter.
Xiang, Haihao [Fri, 7 Nov 2008 06:58:04 +0000 (14:58 +0800)]
mesa: use _bfc0 instead of _col0 when building back face lighting.
Brian Paul [Fri, 7 Nov 2008 00:14:33 +0000 (17:14 -0700)]
mesa: rename OPCODE_INT -> OPCODE_TRUNC
Trunc is a more accurate description; there's no type conversion involved.
Brian Paul [Thu, 6 Nov 2008 22:04:11 +0000 (15:04 -0700)]
mesa: update the shader programs->TexturesUsed array at link time
If an application never calls glUniform() to set sampler variable values
they'll remain 0 (the default value/unit).
Now call _mesa_update_shader_textures_used() at link time in case glUniform()
is never called. program->TextureUsed[] will then be correct for state
validation.
Xiang, Haihao [Thu, 6 Nov 2008 07:25:55 +0000 (15:25 +0800)]
i965: Always check vertex program.
Now i965 also uses the vertex program created by Mesa Core, but this vertex program
is not only depend on mesa state _NEW_PROGRAM, so always check the current vertex
program is updated or not. This fixes broken demo cubemap.