Commit graph

201327 commits

Author SHA1 Message Date
Brian
46bd63819e use gl_ModelViewProjectionMatrixTranspose in ftransform() 2007-03-09 17:02:12 -07:00
Brian
ff95925e70 add NULL ptr check 2007-03-09 16:53:44 -07:00
Michel Dänzer
30b914e2ca Merge branch 'i915tex-pageflip' 2007-03-10 00:19:17 +01:00
Brian
b9ea936150 added GL_CURRENT_PROGRAM 2007-03-09 15:41:25 -07:00
Michel Dänzer
6e0878becf 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.
2007-03-09 20:00:13 +01:00
Michel Dänzer
bb0760ca4f i915tex: Set intel_fb->vbl_waited to current instead of what we aimed for. 2007-03-09 19:56:55 +01:00
Brian
2cf5fd48d1 Merge branch 'origin' into glsl-compiler-1
Conflicts:

	src/mesa/main/context.c
2007-03-09 11:43:53 -07:00
Brian
9f44247acf fix _mesa_uniform_matrix() transpose bug 2007-03-09 11:34:18 -07:00
Michel Dänzer
36b4e25da3 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.
2007-03-09 17:52:29 +01:00
Brian
b03e1712b2 gl_ClipVertex not supported yet 2007-03-09 09:51:55 -07:00
Michel Dänzer
81536789d2 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.
2007-03-09 17:42:55 +01:00
Brian
f9f79c8d77 New IMAGE_RED_TO_LUMINANCE flag passed to _mesa_pack_rgba_span_float() to fix glGetTexImage(GL_LUMINANCE) bug #10232. 2007-03-09 09:13:49 -07:00
Michel Dänzer
4d9901a1ca 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.
2007-03-09 09:43:17 +01:00
Brian
a706b0b8bd added missing bvec2/3/4 constructors 2007-03-08 16:08:55 -07:00
Brian
05b74e4ae4 fix broken vec4_seq, vec4_sne instructions 2007-03-08 15:59:20 -07:00
Brian
2f35a17f38 Update lessThan(), lessThanEqual() functions, improve some matrix constructors. 2007-03-08 15:53:05 -07:00
Brian
5761a93bba 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.
2007-03-08 15:52:22 -07:00
Brian
3e0fbc7efc fix tmp storage problem for IR_I_TO_F 2007-03-08 15:45:25 -07:00
Brian
19a9050548 fix assertion 2007-03-08 15:19:34 -07:00
Brian
ee931f8d4d ; and {} statements were broken 2007-03-08 14:48:34 -07:00
Brian
ec89aba7c6 remove unused new_cjump() 2007-03-08 11:29:22 -07:00
Brian
cce4e50569 IR_CJUMP0/1 no longer used/needed 2007-03-08 11:16:13 -07:00
Brian
63772e2a2c rewrite _slang_gen_select() to use IF node 2007-03-08 11:07:52 -07:00
Brian
b3dd49429b s/_slang_gen_hl_if/_slang_gen_if/ 2007-03-08 10:53:50 -07:00
Brian
609306de17 s/_slang_gen_hl_if/_slang_gen_if/ 2007-03-08 10:43:57 -07:00
Brian
c9f486c38f remove old assertion 2007-03-08 10:40:37 -07:00
Brian
bf86ddaa20 check for attempted writes to read-only vars 2007-03-08 10:40:25 -07:00
Brian
de8172673e 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.
2007-03-08 09:38:35 -07:00
Xiang, Haihao
d85667950f 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.
2007-03-08 22:54:14 +08:00
Brian
6ff0a04f7c fix ProjectionMatrix typo 2007-03-08 07:53:30 -07:00
Brian
7e66cad998 fix gl_TextureMatrix indexing 2007-03-08 07:51:39 -07:00
J.Jansen
79d59d0173 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
2007-03-08 09:53:28 +01:00
Brian
9637c963f5 more DEBUG_PROG 2007-03-07 17:40:57 -07:00
Brian
fb3f0beb42 update comments 2007-03-07 17:37:24 -07:00
Brian
0aec2bb8f2 remove unneeded return stmt 2007-03-07 16:13:33 -07:00
Brian
da899d190e add missing gl_Point state, fix IR storage bug 2007-03-07 16:13:22 -07:00
Nian Wu
1e055089a3 Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline 2007-03-07 16:01:36 -05:00
Brian
29bc4b8974 s/diffuset/diffuse/ 2007-03-07 13:35:49 -07:00
Brian
c3412e9a08 regenerated 2007-03-07 13:07:40 -07:00
Brian
842c782cee use 2.0, 2.1 version strings 2007-03-07 13:07:07 -07:00
Brian
faeea574af remove end_label field 2007-03-07 13:00:06 -07:00
Brian
35d25c0ce4 Fix problem with nested function calls such as y = f(f(x))
Replace CurFunction with curFuncEndLabel.
2007-03-07 12:59:01 -07:00
Brian
5b5a80d011 s/equal/EQUAL/, fix bugs in logical or/and code. 2007-03-07 11:26:47 -07:00
Brian
ab673c8527 fix broken __postDecr() 2007-03-07 11:25:37 -07:00
Brian
1dca089149 fix deferredTexture bug 2007-03-07 10:42:44 -07:00
Michel Dänzer
fb3410297b i915tex: Set framebuffer size to match window before calling _mesa_make_current.
Fixes issues with apps that don't call glViewport by default.
2007-03-07 18:01:39 +01:00
Brian
3efd0c7b8d fix swizzled writemask bug 2007-03-07 09:59:26 -07:00
Brian
f3da222839 remove bogus assertion 2007-03-07 09:58:45 -07:00
Michel Dänzer
9adf6e9d6c 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.
2007-03-07 17:52:44 +01:00
Brian
d25046b648 fix incorrect HPOS write test 2007-03-07 08:56:09 -07:00