mesa.git
17 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into...
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

17 years agoFix TEXREL issues.
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

17 years agocheck for EXT_blend_equation_separate for 2.0
Brian [Sat, 10 Mar 2007 18:48:59 +0000 (11:48 -0700)]
check for EXT_blend_equation_separate for 2.0

17 years agoImplement gl_FrontFacing for fragment shaders.
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.

17 years agoclean-up formatting
Brian [Sat, 10 Mar 2007 17:56:06 +0000 (10:56 -0700)]
clean-up formatting

17 years agoadd NULL ptr check in emit_cond()
Brian [Sat, 10 Mar 2007 17:37:18 +0000 (10:37 -0700)]
add NULL ptr check in emit_cond()

17 years agoi915tex: Fix build against libdrm git...
Michel Dänzer [Sat, 10 Mar 2007 16:12:58 +0000 (17:12 +0100)]
i915tex: Fix build against libdrm git...

17 years agoi915tex: Fix intel_wait_flips being declared implicitly.
Michel Dänzer [Sat, 10 Mar 2007 15:40:22 +0000 (16:40 +0100)]
i915tex: Fix intel_wait_flips being declared implicitly.

17 years agoi915tex: Fix build against released version of libdrm.
Michel Dänzer [Sat, 10 Mar 2007 15:06:38 +0000 (16:06 +0100)]
i915tex: Fix build against released version of libdrm.

17 years agonouveau: fix nv04 swtcl.
Stephane Marchesin [Sat, 10 Mar 2007 12:46:26 +0000 (13:46 +0100)]
nouveau: fix nv04 swtcl.

17 years agonouveau: fix the nv04 swtcl code.
Stephane Marchesin [Sat, 10 Mar 2007 00:25:51 +0000 (01:25 +0100)]
nouveau: fix the nv04 swtcl code.

17 years agonouveau: oops don't debug by default.
Stephane Marchesin [Sat, 10 Mar 2007 00:24:32 +0000 (01:24 +0100)]
nouveau: oops don't debug by default.

17 years agonouveau: some fixes to the nv04 state code.
Stephane Marchesin [Sat, 10 Mar 2007 00:23:40 +0000 (01:23 +0100)]
nouveau: some fixes to the nv04 state code.

17 years agonouveau: add a fifo size debug check.
Stephane Marchesin [Sat, 10 Mar 2007 00:23:14 +0000 (01:23 +0100)]
nouveau: add a fifo size debug check.

17 years agouse gl_ModelViewProjectionMatrixTranspose in ftransform()
Brian [Sat, 10 Mar 2007 00:02:12 +0000 (17:02 -0700)]
use gl_ModelViewProjectionMatrixTranspose in ftransform()

17 years agoadd NULL ptr check
Brian [Fri, 9 Mar 2007 23:53:44 +0000 (16:53 -0700)]
add NULL ptr check

17 years agoMerge branch 'i915tex-pageflip'
Michel Dänzer [Fri, 9 Mar 2007 23:19:17 +0000 (00:19 +0100)]
Merge branch 'i915tex-pageflip'

17 years agoadded GL_CURRENT_PROGRAM
Brian [Fri, 9 Mar 2007 22:41:25 +0000 (15:41 -0700)]
added GL_CURRENT_PROGRAM

17 years agoi915tex: Wait for pending scheduled flips before switching vsync pipe.
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.

17 years agoi915tex: Set intel_fb->vbl_waited to current instead of what we aimed for.
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.

17 years agoMerge branch 'origin' into glsl-compiler-1
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

17 years agofix _mesa_uniform_matrix() transpose bug
Brian [Fri, 9 Mar 2007 18:34:18 +0000 (11:34 -0700)]
fix _mesa_uniform_matrix() transpose bug

17 years agoi915tex: Sync pages between pipes immediately again.
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.

17 years agogl_ClipVertex not supported yet
Brian [Fri, 9 Mar 2007 16:51:55 +0000 (09:51 -0700)]
gl_ClipVertex not supported yet

17 years agoi915tex: Do not wait for pending flips on both pipes at the same time.
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.

17 years agoNew IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to fix glGetTe...
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.

17 years agor300: Also update window state when it's already bound but its stamp changed.
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.

17 years agoadded missing bvec2/3/4 constructors
Brian [Thu, 8 Mar 2007 23:08:55 +0000 (16:08 -0700)]
added missing bvec2/3/4 constructors

17 years agofix broken vec4_seq, vec4_sne instructions
Brian [Thu, 8 Mar 2007 22:59:20 +0000 (15:59 -0700)]
fix broken vec4_seq, vec4_sne instructions

17 years agoUpdate lessThan(), lessThanEqual() functions, improve some matrix constructors.
Brian [Thu, 8 Mar 2007 22:53:05 +0000 (15:53 -0700)]
Update lessThan(), lessThanEqual() functions, improve some matrix constructors.

17 years agoAdded IR_SLE and IR_SLT for <= and < operations.
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.

17 years agofix tmp storage problem for IR_I_TO_F
Brian [Thu, 8 Mar 2007 22:45:25 +0000 (15:45 -0700)]
fix tmp storage problem for IR_I_TO_F

17 years agofix assertion
Brian [Thu, 8 Mar 2007 22:19:34 +0000 (15:19 -0700)]
fix assertion

17 years ago; and {} statements were broken
Brian [Thu, 8 Mar 2007 21:48:34 +0000 (14:48 -0700)]
; and {} statements were broken

17 years agoremove unused new_cjump()
Brian [Thu, 8 Mar 2007 18:29:22 +0000 (11:29 -0700)]
remove unused new_cjump()

17 years agoIR_CJUMP0/1 no longer used/needed
Brian [Thu, 8 Mar 2007 18:16:13 +0000 (11:16 -0700)]
IR_CJUMP0/1 no longer used/needed

17 years agorewrite _slang_gen_select() to use IF node
Brian [Thu, 8 Mar 2007 18:07:52 +0000 (11:07 -0700)]
rewrite _slang_gen_select() to use IF node

17 years agos/_slang_gen_hl_if/_slang_gen_if/
Brian [Thu, 8 Mar 2007 17:53:50 +0000 (10:53 -0700)]
s/_slang_gen_hl_if/_slang_gen_if/

17 years agos/_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/

17 years agoremove old assertion
Brian [Thu, 8 Mar 2007 17:40:37 +0000 (10:40 -0700)]
remove old assertion

17 years agocheck for attempted writes to read-only vars
Brian [Thu, 8 Mar 2007 17:40:25 +0000 (10:40 -0700)]
check for attempted writes to read-only vars

17 years agoRework matrix-related code.
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.

17 years ago remove a if-statement
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.

17 years agofix ProjectionMatrix typo
Brian [Thu, 8 Mar 2007 14:53:30 +0000 (07:53 -0700)]
fix ProjectionMatrix typo

17 years agofix gl_TextureMatrix indexing
Brian [Thu, 8 Mar 2007 14:51:39 +0000 (07:51 -0700)]
fix gl_TextureMatrix indexing

17 years ago Updates of the OpenVMS makefiles.
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

17 years agomore DEBUG_PROG
Brian [Thu, 8 Mar 2007 00:40:57 +0000 (17:40 -0700)]
more DEBUG_PROG

17 years agoupdate comments
Brian [Thu, 8 Mar 2007 00:37:24 +0000 (17:37 -0700)]
update comments

17 years agoremove unneeded return stmt
Brian [Wed, 7 Mar 2007 23:13:33 +0000 (16:13 -0700)]
remove unneeded return stmt

17 years agoadd missing gl_Point state, fix IR storage bug
Brian [Wed, 7 Mar 2007 23:13:22 +0000 (16:13 -0700)]
add missing gl_Point state, fix IR storage bug

17 years agos/diffuset/diffuse/
Brian [Wed, 7 Mar 2007 20:35:49 +0000 (13:35 -0700)]
s/diffuset/diffuse/

17 years agoregenerated
Brian [Wed, 7 Mar 2007 20:07:40 +0000 (13:07 -0700)]
regenerated

17 years agouse 2.0, 2.1 version strings
Brian [Wed, 7 Mar 2007 20:07:07 +0000 (13:07 -0700)]
use 2.0, 2.1 version strings

17 years agoremove end_label field
Brian [Wed, 7 Mar 2007 20:00:06 +0000 (13:00 -0700)]
remove end_label field

17 years agoFix problem with nested function calls such as y = f(f(x))
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.

17 years agos/equal/EQUAL/, fix bugs in logical or/and code.
Brian [Wed, 7 Mar 2007 18:26:47 +0000 (11:26 -0700)]
s/equal/EQUAL/, fix bugs in logical or/and code.

17 years agofix broken __postDecr()
Brian [Wed, 7 Mar 2007 18:25:37 +0000 (11:25 -0700)]
fix broken __postDecr()

17 years agofix deferredTexture bug
Brian [Wed, 7 Mar 2007 17:42:44 +0000 (10:42 -0700)]
fix deferredTexture bug

17 years agoi915tex: Set framebuffer size to match window before calling _mesa_make_current.
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.

17 years agofix swizzled writemask bug
Brian [Wed, 7 Mar 2007 16:59:26 +0000 (09:59 -0700)]
fix swizzled writemask bug

17 years agoremove bogus assertion
Brian [Wed, 7 Mar 2007 16:58:45 +0000 (09:58 -0700)]
remove bogus assertion

17 years agoi945_miptree_layout: Adapt cubemap fixes from i915_miptree_layout.
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.

17 years agofix incorrect HPOS write test
Brian [Wed, 7 Mar 2007 15:56:09 +0000 (08:56 -0700)]
fix incorrect HPOS write test

17 years agoadditional error detection
Brian [Wed, 7 Mar 2007 15:55:42 +0000 (08:55 -0700)]
additional error detection

17 years agocheck for null program ptrs in _mesa_uniform()
Brian [Wed, 7 Mar 2007 15:04:06 +0000 (08:04 -0700)]
check for null program ptrs in _mesa_uniform()

17 years agoGenerate an error if the vertex shader does not write to gl_Position.
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.

17 years agodestroy window during cleanup
Brian [Tue, 6 Mar 2007 23:33:00 +0000 (16:33 -0700)]
destroy window during cleanup

17 years agomore integer arithmetic updates
Brian [Tue, 6 Mar 2007 23:32:03 +0000 (16:32 -0700)]
more integer arithmetic updates

17 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
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

17 years agoexplicit calls to _mesa_unreference_framebuffer() not always needed now
Brian [Tue, 6 Mar 2007 23:26:22 +0000 (16:26 -0700)]
explicit calls to _mesa_unreference_framebuffer() not always needed now

17 years agounreference old framebuffer, if needed, in _mesa_reference_framebuffer()
Brian [Tue, 6 Mar 2007 23:26:02 +0000 (16:26 -0700)]
unreference old framebuffer, if needed, in _mesa_reference_framebuffer()

17 years agofix renderbuffer mem leak
Brian [Tue, 6 Mar 2007 23:25:07 +0000 (16:25 -0700)]
fix renderbuffer mem leak

17 years agoformatting fix
Brian [Tue, 6 Mar 2007 23:24:48 +0000 (16:24 -0700)]
formatting fix

17 years agofix some int arithmetic problems
Brian [Tue, 6 Mar 2007 21:07:48 +0000 (14:07 -0700)]
fix some int arithmetic problems

17 years agoMerge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Ian Romanick [Tue, 6 Mar 2007 19:50:33 +0000 (11:50 -0800)]
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa

17 years agoFix cut-and-paste error in the name of GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB.
Ian Romanick [Tue, 6 Mar 2007 19:50:21 +0000 (11:50 -0800)]
Fix cut-and-paste error in the name of GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB.

17 years agomore DEBUG_PROG code
Brian [Tue, 6 Mar 2007 19:15:30 +0000 (12:15 -0700)]
more DEBUG_PROG code

17 years agofix vert/frag typo
Brian [Tue, 6 Mar 2007 18:53:27 +0000 (11:53 -0700)]
fix vert/frag typo

17 years agoFix/improve framebuffer object reference counting.
Brian [Tue, 6 Mar 2007 17:07:59 +0000 (10:07 -0700)]
Fix/improve framebuffer object reference counting.

Use _mesa_reference_framebuffer() and _mesa_unreference_framebuffer() functions
to be sure reference counting is done correctly.  Additional assertions are
done too.  Note _mesa_dereference_framebuffer() renamed to "unreference" as
that's more accurate.

17 years agoTake care of texObj reference in _mesa_free_framebuffer_data()
Brian [Tue, 6 Mar 2007 16:49:15 +0000 (09:49 -0700)]
Take care of texObj reference in _mesa_free_framebuffer_data()

17 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Tue, 6 Mar 2007 16:03:18 +0000 (09:03 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

17 years agor300: Call radeonSetCliprects from radeonMakeCurrent.
Michel Dänzer [Tue, 6 Mar 2007 12:22:35 +0000 (13:22 +0100)]
r300: Call radeonSetCliprects from radeonMakeCurrent.

Based on a patch by Panagiotis Papadakos.

Among other things, this makes sure the framebuffer object associated with the
drawable has the correct size when _mesa_make_current is called, so the default
viewport is set up correctly.

Also update radeon->lastStamp in radeonSetCliprects.

17 years agofix for bug#10182
Xiang, Haihao [Tue, 6 Mar 2007 07:47:37 +0000 (15:47 +0800)]
fix for bug#10182

call _mesa_dereference_framebuffer instead of _mesa_dereference_framebuffer
in i810, i915, i915tex, i965 drivers.

17 years agofix for bug#9971
Xiang, Haihao [Mon, 5 Mar 2007 14:18:21 +0000 (22:18 +0800)]
fix for bug#9971

call swsetup_Wakeup before falling back to software rendering

17 years agoPropogate UsesKill information.
Keith Whitwell [Sun, 4 Mar 2007 21:47:05 +0000 (21:47 +0000)]
Propogate UsesKill information.

17 years agor300: Use register name & add a register about shading.
Christoph Bill [Thu, 1 Mar 2007 20:11:45 +0000 (21:11 +0100)]
r300: Use register name & add a register about shading.

17 years agor300: Use reg definition when available & add missing reg definition.
Christoph Bill [Thu, 1 Mar 2007 19:45:04 +0000 (20:45 +0100)]
r300: Use reg definition when available & add missing reg definition.

17 years agoAdd early register descritpion.
Christoph Bill [Thu, 1 Mar 2007 19:40:25 +0000 (20:40 +0100)]
Add early register descritpion.

This need more work on case where we can disable
or enable early  (stencil, alpha might need it to
be disable).

17 years agoOptimize cos&sin instruction a bit more.
Rune Petersen [Thu, 1 Mar 2007 19:36:19 +0000 (20:36 +0100)]
Optimize cos&sin instruction a bit more.

17 years agomove oldFb decl into tighter scopes
Brian [Thu, 1 Mar 2007 16:40:21 +0000 (09:40 -0700)]
move oldFb decl into tighter scopes

17 years agofix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general
Brian [Thu, 1 Mar 2007 16:17:01 +0000 (09:17 -0700)]
fix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general

17 years agofix clipping, display name, warnings
Brian [Thu, 1 Mar 2007 14:56:11 +0000 (07:56 -0700)]
fix clipping, display name, warnings

17 years agos/unsigned int/size_t/ (bug 10135)
Brian [Thu, 1 Mar 2007 14:42:42 +0000 (07:42 -0700)]
s/unsigned int/size_t/ (bug 10135)

17 years agoinclude assert.h
Brian [Thu, 1 Mar 2007 14:39:27 +0000 (07:39 -0700)]
include assert.h

17 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Wed, 28 Feb 2007 18:58:30 +0000 (11:58 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

17 years agos/ARB/MESA/ in extension check (bug 10126)
Brian [Wed, 28 Feb 2007 18:58:06 +0000 (11:58 -0700)]
s/ARB/MESA/ in extension check (bug 10126)

17 years agoi915tex: Sync pages differently when crossing pipe borders.
Michel Dänzer [Wed, 28 Feb 2007 16:46:07 +0000 (17:46 +0100)]
i915tex: Sync pages differently when crossing pipe borders.

Don't flip (up to twice) immediately but just arrange things such that the
pages will be in sync on both pipes on the next flip.

17 years agoi915tex: Check that intel_rb is valid before trying to add it to an fbo.
Michel Dänzer [Wed, 28 Feb 2007 16:42:54 +0000 (17:42 +0100)]
i915tex: Check that intel_rb is valid before trying to add it to an fbo.

17 years agoi915tex: Also update intel_rb->vbl_pending when scheduled swap is not a flip.
Michel Dänzer [Wed, 28 Feb 2007 15:05:49 +0000 (16:05 +0100)]
i915tex: Also update intel_rb->vbl_pending when scheduled swap is not a flip.

17 years agonouveau: drm interface changes
Ben Skeggs [Wed, 28 Feb 2007 04:31:28 +0000 (15:31 +1100)]
nouveau: drm interface changes