OSDN Git Service
Brian [Sat, 24 Mar 2007 16:18:14 +0000 (10:18 -0600)]
Properly free the slang_ir_node->Store data (use ref counting).
Brian [Sat, 24 Mar 2007 16:16:49 +0000 (10:16 -0600)]
When computing render_inputs_bitset, omit primary color if we have a fragment program and it doesn't need FRAG_ATTRIB_COL0. Silences valgrind warnings.
Brian [Sat, 24 Mar 2007 15:40:20 +0000 (09:40 -0600)]
move some code into new slang_ir.c file
Brian [Sat, 24 Mar 2007 15:39:24 +0000 (09:39 -0600)]
IR utility functions
Brian [Fri, 23 Mar 2007 23:49:19 +0000 (17:49 -0600)]
document internal compiler options
Brian [Fri, 23 Mar 2007 23:48:42 +0000 (17:48 -0600)]
Fix issues related to the 'continue' statement.
IR_LOOP now has two children: the body code, and the tail code.
Tail code is the "i++" part of a for-loop, or the expression at the end
of a "do {} while(expr);" loop.
"continue" translates into: "execute tail code; CONT;"
Also, the test for infinite do/while loops was incorrect.
Brian [Fri, 23 Mar 2007 23:45:53 +0000 (17:45 -0600)]
consolidate some code
Brian [Fri, 23 Mar 2007 20:47:46 +0000 (14:47 -0600)]
Add the ability to generate programs that doesn't use condition codes.
ctx->Shader.EmitCondCodes determines if we use condition codes.
If not, IF statement uses first operand's X component as the condition.
Added OPCODE_BRK0, OPCODE_BRK1, OPCODE_CONT0, OPCODE_CONT1 to handle
the common cases of conditional break/continue.
Brian [Fri, 23 Mar 2007 20:44:34 +0000 (14:44 -0600)]
minor tweaks
Brian [Fri, 23 Mar 2007 16:46:08 +0000 (10:46 -0600)]
updated comment
Brian [Thu, 22 Mar 2007 22:07:43 +0000 (16:07 -0600)]
updated comment
Brian [Thu, 22 Mar 2007 22:07:14 +0000 (16:07 -0600)]
Overhaul emit_compare() function.
Previously, comparing vec2, vec3, vec4 was broken.
Added IR_EQUAL, IR_NOTEQUAL nodes/operators to compute boolean
equality/inequality vs. IR_SEQUAL/IR_SNEQUAL which work component-wise.
Use IR_EQUAL/IR_NOTEQUAL for the == and != operators.
To compute vec4 equality, use SNE, DP4, SEQ instruction sequence.
Brian [Thu, 22 Mar 2007 15:15:39 +0000 (09:15 -0600)]
First pass at implementing structure compares.
Need to improve this. There may be holes in a structure so we can't
just blindly compare the full 4-float registers.
Brian [Thu, 22 Mar 2007 15:11:26 +0000 (09:11 -0600)]
use _mesa_copy_instructions()
Brian [Thu, 22 Mar 2007 15:07:27 +0000 (09:07 -0600)]
In _mesa_add_unnamed_constant() and _mesa_lookup_parameter_constant() allow swizzleOut==NULL.
There are times when we don't want to allow swizzling when searching for or
adding vector constants. Passing NULL for swizzleOut disables swizzling.
This fixes a constant/swizzle bug in link_uniform_vars().
Brian [Thu, 22 Mar 2007 15:04:18 +0000 (09:04 -0600)]
print conditional writemask, if enabled
Brian [Wed, 21 Mar 2007 21:40:54 +0000 (15:40 -0600)]
added SWIZZLE_XYZW
Brian [Wed, 21 Mar 2007 21:40:39 +0000 (15:40 -0600)]
Support for user-defined structures.
struct == and != operators not finished yet. Struct assignment works though.
Brian [Wed, 21 Mar 2007 21:38:46 +0000 (15:38 -0600)]
disable apparently unused code
Brian [Wed, 21 Mar 2007 20:45:34 +0000 (14:45 -0600)]
indent
Brian [Wed, 21 Mar 2007 17:57:30 +0000 (11:57 -0600)]
merge from master
Brian [Wed, 21 Mar 2007 17:41:41 +0000 (11:41 -0600)]
disable assertion
Brian [Wed, 21 Mar 2007 15:45:58 +0000 (09:45 -0600)]
document 1D convolution fix
Brian [Wed, 21 Mar 2007 15:44:03 +0000 (09:44 -0600)]
1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image transfers.
Roland Scheidegger [Wed, 21 Mar 2007 12:19:02 +0000 (13:19 +0100)]
fix copy and paste bug from last commit in fog generation code for GL_LINEAR fog
Ben Skeggs [Wed, 21 Mar 2007 06:54:57 +0000 (17:54 +1100)]
nouveau: update for drm interface changes (0.0.5)
Ben Skeggs [Wed, 21 Mar 2007 04:05:07 +0000 (15:05 +1100)]
nouveau: SwapBuffers() needs to perform a glFlush()
Xiang, Haihao [Wed, 21 Mar 2007 02:50:19 +0000 (10:50 +0800)]
mesa: revert
f9f79c8d770e696249bd98c68b563f887562c974
to fix #10232
Table6.1(in gl2.1) has been applied for glGetTexImage
before calling into _mesa_pack_rgba_span_float.
Nicolai Haehnle [Tue, 20 Mar 2007 23:56:38 +0000 (00:56 +0100)]
r300: Remove the program-global const_sin index
The index is no longer necessary to share constants between multiple
SIN/COS/SCS instructions inside a single fragment program, and storing
a tiny implementation detail like this in the fragment_program structure
itself was just nasty.
Nicolai Haehnle [Mon, 19 Mar 2007 22:30:26 +0000 (23:30 +0100)]
r300: Whitespace cleanup (remove trailing spaces)
Xiang, Haihao [Tue, 20 Mar 2007 14:12:03 +0000 (22:12 +0800)]
fix for bug#10347
not sure which brw surface for DXT3 & DXT5, so restore
the previous choice.(changed in commit
84081774e62a8af18e6bf894ea69f63b97dcfe96)
Alan Hourihane [Tue, 20 Mar 2007 13:15:58 +0000 (13:15 +0000)]
use passed target parameter
Ben Skeggs [Tue, 20 Mar 2007 04:59:55 +0000 (15:59 +1100)]
nouveau: fix typo
Ben Skeggs [Tue, 20 Mar 2007 04:52:57 +0000 (15:52 +1100)]
nouveau: fail translate if we use too many params somehow
Ben Skeggs [Tue, 20 Mar 2007 04:05:35 +0000 (15:05 +1100)]
nouveau: NVSDBG macro
Nicolai Haehnle [Mon, 19 Mar 2007 22:32:36 +0000 (23:32 +0100)]
r300: Cleanup fragment program constant allocation, share constants
The constant/parameter allocation was significantly simplified, removing
one unnecessary copy operation of parameters. The dirty state tracking is
unchanged and far from optimal, since all state is always re-fetched.
Constants and parameters are now emitted only once, which significantly
reduces the resource pressure on larger programs.
Nicolai Haehnle [Mon, 19 Mar 2007 21:26:08 +0000 (22:26 +0100)]
r300: Fix special case (tmp.x <= 0) in fragment program LIT instruction
Also, fix a typo in a related comment.
Nicolai Haehnle [Mon, 19 Mar 2007 21:17:16 +0000 (22:17 +0100)]
r300: Clear fragment program instruction slots on first use
Make sure that instruction slots are fully initialized with NOPs during
find_and_prepare_slot(). This fixes a bug when a fragment program was
translated more than once (e.g. due to a second call to glProgramStringARB).
This partially fixes glean/fragProg1.
Brian [Mon, 19 Mar 2007 20:44:15 +0000 (14:44 -0600)]
Properly compute render_inputs_bitset when using a vertex program/shader.
This fixes a performance regression introduced early in glsl-compiler-1 work.
Nicolai Haehnle [Mon, 19 Mar 2007 19:01:20 +0000 (20:01 +0100)]
r300: Dump fragment program after translation if RADEON_DEBUG=pixel is set
Nicolai Haehnle [Mon, 19 Mar 2007 18:46:25 +0000 (19:46 +0100)]
r300: Whitespace cleanup (remove trailing spaces)
Nicolai Haehnle [Mon, 19 Mar 2007 18:45:45 +0000 (19:45 +0100)]
r300: Fix WRITEMASK handling when writing to result.depth
This is a necessary change to emit the right instructions when writing
to result.depth.
However, even with this test, Z-write doesn't work properly, and I don't
fully understand why. In addition to this, we'll at least have to disable
early-Z, but even that doesn't seem to be enough.
Nicolai Haehnle [Sun, 18 Mar 2007 17:32:32 +0000 (18:32 +0100)]
r300: Streamlined fragment program LIT implementation
Fix a bug in the LIT implementation (clamp exponent to 128, not 0.5)
and change the implementation around. In theory, the new implementation
needs as little as 5 instruction slots. Unfortunately, the dependency
analysis in find_and_replace_slot is not strong enough to look at
individual components of a register yet.
Nicolai Haehnle [Sun, 18 Mar 2007 12:29:18 +0000 (13:29 +0100)]
r300: Fix fragment program reordering
Do not move an instruction that writes to a temp forward past an instruction
that reads the same temporary.
Nicolai Haehnle [Sun, 18 Mar 2007 12:09:21 +0000 (13:09 +0100)]
r300: Fragment program dumps format tex instructions
Nicolai Haehnle [Sun, 18 Mar 2007 11:46:53 +0000 (12:46 +0100)]
r300: Fix hw fragment program dump
Dumps of fragment programs were incorrect when the program consisted of multiple
nodes.
Also, improved the formatting a bit.
Nicolai Haehnle [Sun, 18 Mar 2007 01:15:56 +0000 (02:15 +0100)]
r300: Fix fragment program instruction pairing and register allocation
There were a number of bugs related to the pairing of vector and scalar
operations where swizzles ended up using the wrong source register,
or an instruction was moved forward and ended up overwriting an aliased
register.
The new algorithm for register allocation is quite conservative and may
run out of registers before necessary. On the plus side, It Just Works.
Pairing is done whenever possible, and in more cases than before, so
in practice this change should be a net win.
Michel Dänzer [Mon, 19 Mar 2007 17:34:27 +0000 (18:34 +0100)]
i915tex: The intended triple buffering fix.
Making modifications while the editor spawned by git-commit was suspended
didn't have the intended effect.
Michel Dänzer [Mon, 19 Mar 2007 16:23:44 +0000 (17:23 +0100)]
i915tex: Fix triple buffering after recent Mesa core changes.
Remove superfluous _mesa_resize_framebuffer call which is now harmful because
it causes the third renderbuffer to have width/height 0, so Mesa refuses to
render to it.
In the long term, it would be nice to remove the hack in
intel_alloc_window_storage in favour of a proper Mesa interface for flipping
between more than two colour buffers.
Keith Whitwell [Sun, 18 Mar 2007 20:13:06 +0000 (20:13 +0000)]
fix off-by-one in load_state_immediate
Keith Whitwell [Sun, 18 Mar 2007 20:12:53 +0000 (20:12 +0000)]
fix typo in subrect_disable packet
Keith Whitwell [Sun, 18 Mar 2007 20:12:38 +0000 (20:12 +0000)]
fix typo in subrect_disable packet
Miguel Marte [Sun, 18 Mar 2007 17:08:29 +0000 (11:08 -0600)]
screen offset changes, bug 9965
Nicolai Haehnle [Sun, 18 Mar 2007 17:02:35 +0000 (11:02 -0600)]
fix assertion in read_depth_pixels()
Oliver McFadden [Sun, 18 Mar 2007 16:57:45 +0000 (16:57 +0000)]
r300: Removed the deprecated $XFree86$ CVS keywords.
Oliver McFadden [Sun, 18 Mar 2007 16:44:20 +0000 (16:44 +0000)]
r300: Corrected the string for polygon mode; it wasn't updated from unkXXX.
Ben Skeggs [Sun, 18 Mar 2007 13:08:45 +0000 (00:08 +1100)]
nouveau: avoid using uninitialised TexSrcUnit.
Xiang, Haihao [Sun, 18 Mar 2007 10:44:51 +0000 (18:44 +0800)]
mesa: SWAP_BUFF support when calling DrawPixels(DEPTH_COMPONENT)
or TexImage(DEPTH_COMPONENT)
Xiang, Haihao [Sun, 18 Mar 2007 10:34:21 +0000 (18:34 +0800)]
mesa: enhance fxt1_quantize_ALPHA1
If possible, let minCol != maxCol
Xiang, Haihao [Sun, 18 Mar 2007 10:26:16 +0000 (18:26 +0800)]
i965: fix for FXT1 & S3TC texture format
choose the right mesa texformat for FXT1 & S3TC
Oliver McFadden [Sun, 18 Mar 2007 07:21:21 +0000 (07:21 +0000)]
Use _mesa_copy_instructions rather than memcpy in _mesa_insert_mvp_code.
Haihao Xiang [Sat, 17 Mar 2007 15:42:36 +0000 (09:42 -0600)]
fix some format conversion bugs in glGetTexImage(), bug 10288
Dave Airlie [Sat, 17 Mar 2007 05:46:24 +0000 (16:46 +1100)]
r300: change vendor string to DRI R300 Project
Brian [Fri, 16 Mar 2007 17:00:07 +0000 (11:00 -0600)]
Assorted fixes for dealing with zero-size frame/renderbuffers.
In xmesa_check_and_update_buffer_size() handle xmctx==NULL correctly: still
call _mesa_resize_framebufer(). If we don't we can wind up in a situation
where the framebuffer size is non-zero but an attached renderbuffer size
is still initialized to zero. This inconsistancy can later cause problems.
Check for zero-size renderbuffers in update_color_draw_buffers() and
update_color_read_buffer().
See bug 7205.
Brian [Fri, 16 Mar 2007 15:36:12 +0000 (09:36 -0600)]
Colortable re-org.
The pixel transfer path has three color table lookups.
Use an array [3] to store that info, rather than separate variables.
Brian [Fri, 16 Mar 2007 14:36:22 +0000 (08:36 -0600)]
added a renderbuffer comment
Mathias Hopf [Fri, 16 Mar 2007 14:28:34 +0000 (08:28 -0600)]
added null xmctx check to XMesaResizeBuffers(), bug 7205
Brian [Thu, 15 Mar 2007 22:07:39 +0000 (16:07 -0600)]
silently ignore DeleteProgram/Shader(id=0)
Brian [Thu, 15 Mar 2007 22:06:58 +0000 (16:06 -0600)]
in _mesa_GetColorTable, return silently if table size is 0
Oliver McFadden [Thu, 15 Mar 2007 21:57:31 +0000 (21:57 +0000)]
Fixed a minor typo in the comment near _mesa_copy_instructions.
Oliver McFadden [Thu, 15 Mar 2007 20:55:30 +0000 (20:55 +0000)]
r300: Added _mesa_copy_instructions.
Oliver McFadden [Thu, 15 Mar 2007 20:39:07 +0000 (20:39 +0000)]
r300: Renamed r300_vertexprog.c to r300_vertprog.c
Oliver McFadden [Thu, 15 Mar 2007 19:49:10 +0000 (19:49 +0000)]
r300: Use _mesa_alloc_instructions/_mesa_init_instructions instead of malloc.
Note that insert_wpos in r300_vertexprog.c is still a little flaky and could be
improved.
Oliver McFadden [Thu, 15 Mar 2007 19:09:10 +0000 (19:09 +0000)]
r300: Updated R300 to use the new SWIZZLE macros.
Oliver McFadden [Thu, 15 Mar 2007 18:44:29 +0000 (18:44 +0000)]
r300: Fixed an unused variable warning and removed some cruft, too.
Oliver McFadden [Thu, 15 Mar 2007 18:29:13 +0000 (18:29 +0000)]
r300: Fixed a printf conversion warning.
Oliver McFadden [Thu, 15 Mar 2007 18:26:01 +0000 (18:26 +0000)]
r300: Fixed "no previous prototype for 'r300RefillCurrentDmaRegion'" warning.
Brian [Thu, 15 Mar 2007 17:51:54 +0000 (11:51 -0600)]
added SWIZZLE_XXXX, YYYY, etc. macros
Oliver McFadden [Thu, 15 Mar 2007 17:35:34 +0000 (17:35 +0000)]
Committed Rune Petersen's fragment.position patch (Bug #10024) plus a few small
corrections.
Brian [Thu, 15 Mar 2007 17:16:41 +0000 (11:16 -0600)]
no-op clear if buffer width or height is zero (bug 7205)
Brian [Thu, 15 Mar 2007 17:11:41 +0000 (11:11 -0600)]
add some rb->Data null ptr checks (bug 7205)
Brian [Thu, 15 Mar 2007 15:03:03 +0000 (09:03 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Thu, 15 Mar 2007 15:02:14 +0000 (09:02 -0600)]
implement byteswapping for all multi-byte types in _mesa_pack_rgba_span_float(), bug 10298
Keith Whitwell [Thu, 15 Mar 2007 10:27:47 +0000 (10:27 +0000)]
Fix off by one error in immediate state packet size.
Brian [Wed, 14 Mar 2007 20:56:39 +0000 (14:56 -0600)]
pixelmap code simplification
Brian [Wed, 14 Mar 2007 20:33:46 +0000 (14:33 -0600)]
Re-org of gl_pixel_attrib struct.
Reorder fields according to the order in which the pixel transfer operations
take place. Improve comments.
Move the pixel maps out of gl_pixel_attrib since they're not supposed to be
pushed/popped by glPush/PopAttrib.
New gl_pixelmap and gl_pixelmaps structs to contain the pixelmaps.
Brian [Wed, 14 Mar 2007 19:34:30 +0000 (13:34 -0600)]
s/Tranpose/Transpose/
Brian [Wed, 14 Mar 2007 18:52:53 +0000 (12:52 -0600)]
clear the b->frontxrb->drawable field in xmesa_free_buffer(), see bug 7205
Brian [Wed, 14 Mar 2007 18:43:26 +0000 (12:43 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Wed, 14 Mar 2007 18:42:30 +0000 (12:42 -0600)]
move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205
Brian [Wed, 14 Mar 2007 17:07:32 +0000 (11:07 -0600)]
continue prev check-in: save ptr to slang_function for SLANG_OPER_CALL
Brian [Wed, 14 Mar 2007 16:49:35 +0000 (10:49 -0600)]
After we've found the slang_function ptr for a SLANG_OPER_CALL node, save the ptr in the node for reuse.
This can save a tremendous amount of time when resolving types in complex
expressions. One particular shader was taking several minutes to compile
but now compiles almost instantaneoulsy.
Brian [Wed, 14 Mar 2007 16:16:18 +0000 (10:16 -0600)]
make _slang_typeof_function() static
Brian [Wed, 14 Mar 2007 14:56:01 +0000 (08:56 -0600)]
remove old assertion
Brian [Tue, 13 Mar 2007 22:50:24 +0000 (16:50 -0600)]
more bug fixing, error checking
Brian [Tue, 13 Mar 2007 22:32:48 +0000 (16:32 -0600)]
fix a number of issues in _mesa_uniform()
Brian [Tue, 13 Mar 2007 22:31:30 +0000 (16:31 -0600)]
remove bogus assertion
Brian [Tue, 13 Mar 2007 22:12:23 +0000 (16:12 -0600)]
document some bug fixes, lots of new features
Brian [Tue, 13 Mar 2007 22:07:04 +0000 (16:07 -0600)]
fix ctx->Pixel.PostConvolutionScale/Bias subscript bugs
Brian [Tue, 13 Mar 2007 21:58:40 +0000 (15:58 -0600)]
Check for, simplify vec2/3/4(x). Only do call adapting for constructors.