Brian [Wed, 14 Mar 2007 19:34:30 +0000 (13:34 -0600)]
s/Tranpose/Transpose/
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.
Brian [Tue, 13 Mar 2007 21:57:09 +0000 (15:57 -0600)]
improve literal printing
Brian [Tue, 13 Mar 2007 21:55:54 +0000 (15:55 -0600)]
disable some debug output
Brian [Tue, 13 Mar 2007 21:55:41 +0000 (15:55 -0600)]
better error msg for undefined function, disable some debug output
Brian [Tue, 13 Mar 2007 21:00:14 +0000 (15:00 -0600)]
get rid of float_multiply, float_add, float_divide
Brian [Tue, 13 Mar 2007 17:00:21 +0000 (11:00 -0600)]
alloc an extra byte in _mesa_ShaderSourceARB() to silence a valgrind warning
Brian [Tue, 13 Mar 2007 16:58:48 +0000 (10:58 -0600)]
be smarter about which fragment attribs are interpolated before running frag progs
Brian [Tue, 13 Mar 2007 16:58:23 +0000 (10:58 -0600)]
comment about SPAN_* vs FRAG_BIT_* values
Brian [Tue, 13 Mar 2007 16:53:16 +0000 (10:53 -0600)]
Check if FRAG_RESULT_COLR is written and update span->interpMask, arrayMask.
Also, fix an assertion.
Brian [Tue, 13 Mar 2007 16:49:08 +0000 (10:49 -0600)]
Shuffle some code around in the emit_tex() and emit_move() instructions.
Note that the inst ptr returned by new_instruction() may become invalid
after calling emit_() since the emit functions may allocate new instructions
which is done vial realloc().
Also, add some new assertions to try to catch this kind of bug.
Brian [Tue, 13 Mar 2007 16:28:26 +0000 (10:28 -0600)]
properly compute ctx->Texture._EnabledCoordUnits
Brian [Mon, 12 Mar 2007 23:29:50 +0000 (17:29 -0600)]
Implement GL_ARB_texture_rectangle support
This includes the sampler2DRect and sampler2DRectShadow types and
the texture2DRect(), texture2DRectProj(), etc. built-in functions.
Brian [Mon, 12 Mar 2007 16:52:52 +0000 (10:52 -0600)]
Add array bounds checking, fix memleaks, add null ptr checks.
Brian [Mon, 12 Mar 2007 16:30:36 +0000 (10:30 -0600)]
extra stuff for drawbuffers test
Brian [Sun, 11 Mar 2007 23:30:13 +0000 (17:30 -0600)]
added drawbuffers.c
Brian [Sun, 11 Mar 2007 23:29:54 +0000 (17:29 -0600)]
add NULL ptr check
Brian [Sun, 11 Mar 2007 23:03:29 +0000 (17:03 -0600)]
Test the GL_ARB_draw_buffers extension.
Also requires GL_EXT_framebuffer_object and OpenGL 2.0 (for GLSL).
Brian [Sun, 11 Mar 2007 23:00:39 +0000 (17:00 -0600)]
Implement support for GL_ARB_draw_buffers with GL_MAX_DRAW_BUFFERS > 1.
GL_MAX_DRAW_BUFFERS is currently 4.
Added gl_FragData[] output for fragment programs.
In _swrast_write_rgba_span() loop over the color outputs/renderbuffers.
Brian [Sat, 10 Mar 2007 21:07:28 +0000 (14:07 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Brian [Sat, 10 Mar 2007 18:50:50 +0000 (11:50 -0700)]
Fix TEXREL issues.
Patch submitted by Christoph Brill.
See http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml
Brian [Sat, 10 Mar 2007 18:48:59 +0000 (11:48 -0700)]
check for EXT_blend_equation_separate for 2.0
Brian [Sat, 10 Mar 2007 18:30:19 +0000 (11:30 -0700)]
Implement gl_FrontFacing for fragment shaders.
For the time being, we put the gl_FrontFacing value in the FOGC.Y input
register. Combining FOGC and FrontFacing in one register is a bit of a
hack and may need to be changed someday.
Brian [Sat, 10 Mar 2007 17:56:06 +0000 (10:56 -0700)]
clean-up formatting
Brian [Sat, 10 Mar 2007 17:37:18 +0000 (10:37 -0700)]
add NULL ptr check in emit_cond()
Michel Dänzer [Sat, 10 Mar 2007 16:12:58 +0000 (17:12 +0100)]
i915tex: Fix build against libdrm git...
Michel Dänzer [Sat, 10 Mar 2007 15:40:22 +0000 (16:40 +0100)]
i915tex: Fix intel_wait_flips being declared implicitly.
Michel Dänzer [Sat, 10 Mar 2007 15:06:38 +0000 (16:06 +0100)]
i915tex: Fix build against released version of libdrm.
Stephane Marchesin [Sat, 10 Mar 2007 12:46:26 +0000 (13:46 +0100)]
nouveau: fix nv04 swtcl.
Stephane Marchesin [Sat, 10 Mar 2007 00:25:51 +0000 (01:25 +0100)]
nouveau: fix the nv04 swtcl code.
Stephane Marchesin [Sat, 10 Mar 2007 00:24:32 +0000 (01:24 +0100)]
nouveau: oops don't debug by default.
Stephane Marchesin [Sat, 10 Mar 2007 00:23:40 +0000 (01:23 +0100)]
nouveau: some fixes to the nv04 state code.
Stephane Marchesin [Sat, 10 Mar 2007 00:23:14 +0000 (01:23 +0100)]
nouveau: add a fifo size debug check.
Brian [Sat, 10 Mar 2007 00:02:12 +0000 (17:02 -0700)]
use gl_ModelViewProjectionMatrixTranspose in ftransform()
Brian [Fri, 9 Mar 2007 23:53:44 +0000 (16:53 -0700)]
add NULL ptr check
Michel Dänzer [Fri, 9 Mar 2007 23:19:17 +0000 (00:19 +0100)]
Merge branch 'i915tex-pageflip'
Brian [Fri, 9 Mar 2007 22:41:25 +0000 (15:41 -0700)]
added GL_CURRENT_PROGRAM
Michel Dänzer [Fri, 9 Mar 2007 19:00:13 +0000 (20:00 +0100)]
i915tex: Wait for pending scheduled flips before switching vsync pipe.
This avoids hangs when the vblank sequence numbers are not in sync between
pipes, in particular when they run at different refresh rates.
Michel Dänzer [Fri, 9 Mar 2007 18:56:55 +0000 (19:56 +0100)]
i915tex: Set intel_fb->vbl_waited to current instead of what we aimed for.
Brian [Fri, 9 Mar 2007 18:43:53 +0000 (11:43 -0700)]
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/context.c
Brian [Fri, 9 Mar 2007 18:34:18 +0000 (11:34 -0700)]
fix _mesa_uniform_matrix() transpose bug
Michel Dänzer [Fri, 9 Mar 2007 16:52:29 +0000 (17:52 +0100)]
i915tex: Sync pages between pipes immediately again.
This should be safe now that we no longer use the MI_WAIT_FOR_EVENT instruction
incorrectly and should also work correctly with applications that render to the
front buffer.
Brian [Fri, 9 Mar 2007 16:51:55 +0000 (09:51 -0700)]
gl_ClipVertex not supported yet
Michel Dänzer [Fri, 9 Mar 2007 16:41:04 +0000 (17:41 +0100)]
i915tex: Do not wait for pending flips on both pipes at the same time.
The MI_WAIT_FOR_EVENT instruction does not support waiting for several events
at once, so this should fix the lockups with page flipping when both pipes are
enabled.
Brian [Fri, 9 Mar 2007 16:08:41 +0000 (09:08 -0700)]
New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to fix glGetTexImage(GL_LUMINANCE) bug #10232.
Michel Dänzer [Fri, 9 Mar 2007 08:43:17 +0000 (09:43 +0100)]
r300: Also update window state when it's already bound but its stamp changed.
And set new cliprects before deriving other state from them. This ensures
cliprects aren't accessed after having been freed.
Thanks to Panagiotis Papadakos for testing various iterations of this.
Brian [Thu, 8 Mar 2007 23:08:55 +0000 (16:08 -0700)]
added missing bvec2/3/4 constructors
Brian [Thu, 8 Mar 2007 22:59:20 +0000 (15:59 -0700)]
fix broken vec4_seq, vec4_sne instructions
Brian [Thu, 8 Mar 2007 22:53:05 +0000 (15:53 -0700)]
Update lessThan(), lessThanEqual() functions, improve some matrix constructors.
Brian [Thu, 8 Mar 2007 22:52:22 +0000 (15:52 -0700)]
Added IR_SLE and IR_SLT for <= and < operations.
Using IR_SGE and IR_SGT with transposed args doesn't work since the __asm
calls don't do argument matching by name, but by position.
This fixes the broken lessThan() and lessThanEqual() functions.
Brian [Thu, 8 Mar 2007 22:45:25 +0000 (15:45 -0700)]
fix tmp storage problem for IR_I_TO_F
Brian [Thu, 8 Mar 2007 22:19:34 +0000 (15:19 -0700)]
fix assertion
Brian [Thu, 8 Mar 2007 21:48:34 +0000 (14:48 -0700)]
; and {} statements were broken
Brian [Thu, 8 Mar 2007 18:29:22 +0000 (11:29 -0700)]
remove unused new_cjump()
Brian [Thu, 8 Mar 2007 18:16:13 +0000 (11:16 -0700)]
IR_CJUMP0/1 no longer used/needed
Brian [Thu, 8 Mar 2007 18:07:52 +0000 (11:07 -0700)]
rewrite _slang_gen_select() to use IF node
Brian [Thu, 8 Mar 2007 17:53:50 +0000 (10:53 -0700)]
s/_slang_gen_hl_if/_slang_gen_if/
Brian [Thu, 8 Mar 2007 17:43:57 +0000 (10:43 -0700)]
s/_slang_gen_hl_if/_slang_gen_if/
Brian [Thu, 8 Mar 2007 17:40:37 +0000 (10:40 -0700)]
remove old assertion
Brian [Thu, 8 Mar 2007 17:40:25 +0000 (10:40 -0700)]
check for attempted writes to read-only vars
Brian [Thu, 8 Mar 2007 16:38:35 +0000 (09:38 -0700)]
Rework matrix-related code.
GLSL matrices are stored in column-major order while GL_ARB_vertex/fragment_program
use row-major. So, need to use STATE_MATRIX_TRANSPOSE for built-in matrices.
Unfortunately, this means that the expression M * V isn't very efficient since we
need to extract the rows out of M. And that's the typical expression for vertex
transformation: gl_ModelViewProjectionMatrix * gl_Position.
Solve this inefficiency by looking for M*V expressions and replacing them
with V*Transpose(M).
Also, add support for GLSL 1.20's MatrixTranspose, Inverse and InverseTranspose
matrices.
Xiang, Haihao [Thu, 8 Mar 2007 14:54:14 +0000 (22:54 +0800)]
remove a if-statement
glMaterial changes the current specular exponent or glLight changes
the intensity distribution of the light, but _mesa_update_state doesn't
update the corresponding light table. So they must be updated at this time.
Brian [Thu, 8 Mar 2007 14:53:30 +0000 (07:53 -0700)]
fix ProjectionMatrix typo
Brian [Thu, 8 Mar 2007 14:51:39 +0000 (07:51 -0700)]
fix gl_TextureMatrix indexing
J.Jansen [Thu, 8 Mar 2007 08:53:28 +0000 (09:53 +0100)]
Updates of the OpenVMS makefiles.
-include missing definitions
-add files to compile
-remove files from compile list which are removed from the repositry
-add support for vbo
new file: src/mesa/vbo/descrip.mms
modified: src/mesa/descrip.mms
modified: src/mesa/drivers/osmesa/descrip.mms
modified: src/mesa/drivers/x11/descrip.mms
modified: src/mesa/swrast_setup/descrip.mms
modified: src/mesa/tnl/descrip.mms
Brian [Thu, 8 Mar 2007 00:40:57 +0000 (17:40 -0700)]
more DEBUG_PROG
Brian [Thu, 8 Mar 2007 00:37:24 +0000 (17:37 -0700)]
update comments
Brian [Wed, 7 Mar 2007 23:13:33 +0000 (16:13 -0700)]
remove unneeded return stmt
Brian [Wed, 7 Mar 2007 23:13:22 +0000 (16:13 -0700)]
add missing gl_Point state, fix IR storage bug
Brian [Wed, 7 Mar 2007 20:35:49 +0000 (13:35 -0700)]
s/diffuset/diffuse/
Brian [Wed, 7 Mar 2007 20:07:40 +0000 (13:07 -0700)]
regenerated
Brian [Wed, 7 Mar 2007 20:07:07 +0000 (13:07 -0700)]
use 2.0, 2.1 version strings
Brian [Wed, 7 Mar 2007 20:00:06 +0000 (13:00 -0700)]
remove end_label field
Brian [Wed, 7 Mar 2007 19:59:01 +0000 (12:59 -0700)]
Fix problem with nested function calls such as y = f(f(x))
Replace CurFunction with curFuncEndLabel.
Brian [Wed, 7 Mar 2007 18:26:47 +0000 (11:26 -0700)]
s/equal/EQUAL/, fix bugs in logical or/and code.
Brian [Wed, 7 Mar 2007 18:25:37 +0000 (11:25 -0700)]
fix broken __postDecr()
Brian [Wed, 7 Mar 2007 17:42:44 +0000 (10:42 -0700)]
fix deferredTexture bug
Michel Dänzer [Wed, 7 Mar 2007 17:01:39 +0000 (18:01 +0100)]
i915tex: Set framebuffer size to match window before calling _mesa_make_current.
Fixes issues with apps that don't call glViewport by default.
Brian [Wed, 7 Mar 2007 16:59:26 +0000 (09:59 -0700)]
fix swizzled writemask bug
Brian [Wed, 7 Mar 2007 16:58:45 +0000 (09:58 -0700)]
remove bogus assertion
Michel Dänzer [Wed, 7 Mar 2007 16:52:44 +0000 (17:52 +0100)]
i945_miptree_layout: Adapt cubemap fixes from i915_miptree_layout.
Cubemaps aren't working fully correctly yet, but at least they don't seem to
cause crashes anymore.
Brian [Wed, 7 Mar 2007 15:56:09 +0000 (08:56 -0700)]
fix incorrect HPOS write test
Brian [Wed, 7 Mar 2007 15:55:42 +0000 (08:55 -0700)]
additional error detection
Brian [Wed, 7 Mar 2007 15:04:06 +0000 (08:04 -0700)]
check for null program ptrs in _mesa_uniform()
Brian [Wed, 7 Mar 2007 14:52:24 +0000 (07:52 -0700)]
Generate an error if the vertex shader does not write to gl_Position.
Brian [Tue, 6 Mar 2007 23:33:00 +0000 (16:33 -0700)]
destroy window during cleanup
Brian [Tue, 6 Mar 2007 23:32:03 +0000 (16:32 -0700)]
more integer arithmetic updates
Brian [Tue, 6 Mar 2007 23:27:23 +0000 (16:27 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Tue, 6 Mar 2007 23:26:22 +0000 (16:26 -0700)]
explicit calls to _mesa_unreference_framebuffer() not always needed now
Brian [Tue, 6 Mar 2007 23:26:02 +0000 (16:26 -0700)]
unreference old framebuffer, if needed, in _mesa_reference_framebuffer()
Brian [Tue, 6 Mar 2007 23:25:07 +0000 (16:25 -0700)]
fix renderbuffer mem leak