Keith Whitwell
bb1b01616b
Merge branch 'i915tex_privbuffers' into softpipe_0_1_branch
2007-07-17 11:06:02 +01:00
Zou Nan hai
c6d042acc9
Fix SOP in fragment shader, brick is ok now.
2007-07-17 16:52:03 +08:00
Zou Nan hai
3c00cdc5f3
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
2007-07-17 15:42:39 +08:00
Zou Nan hai
24e7acd5e4
bumpmap sample is correct now
2007-07-17 11:25:37 +08:00
Zou Nan hai
719cf0b795
Use ProgramStringNotify
2007-07-17 11:19:52 +08:00
Oliver McFadden
7b410f366f
r300: Corrected some progs/fp/* regressions from the BFC patch.
...
I'm not completely sure this is correct; it restores the old behaviour.
2007-07-16 21:43:39 +00:00
Oliver McFadden
8a016d2130
r300: Use _mesa_num_inst_src_regs for number of arguments.
2007-07-16 20:24:41 +00:00
Oliver McFadden
f66775184b
r300: Corrected vertprog FLR and XPD instruction regression.
2007-07-16 20:07:30 +00:00
Oliver McFadden
3eba764df8
r300: Added code for vertprog opcode ARL.
2007-07-16 19:20:32 +00:00
Oliver McFadden
611674ed69
r300: Don't need vertprog scalar flag anymore; it's handled explicitly...
2007-07-16 19:13:46 +00:00
Oliver McFadden
b89a5c6e06
r300: Removed broken RCC vertprog opcode.
2007-07-16 19:10:13 +00:00
Oliver McFadden
15f1609922
r300: More vertprog rework; give each opcode it's own function.
2007-07-16 19:09:29 +00:00
Roland Scheidegger
cc9cf90b09
fix resize bugs (fb size updated too late), fix typos, cleanups...
2007-07-16 20:53:33 +02:00
Roland Scheidegger
5fc7973d54
small cleanups
2007-07-16 19:01:47 +02:00
Oliver McFadden
39766010cd
Revert "r300: Gracefully exit after GART memory is exhausted."
...
This reverts commit 9457bf62bb .
Causes the X server to die with Compiz and Beryl.
2007-07-16 16:37:38 +00:00
Oliver McFadden
cc85860ccb
r300: Reorder the vertprog code to the ARB specification.
2007-07-16 16:37:38 +00:00
Roland Scheidegger
cbfe29cdee
fix bogus fb/drawable information
...
the framebuffer objects attached to drawables can have invalidate state
associated with them, since for the window framebuffer this is per-context
state and not per-fbo state. Since drivers rely on that information
(otherwise would need to check if currently the window-framebuffer is
bound in a lot of places) fix it up in _mesa_make_current (ugly).
(Brought over from i915tex_privbuffers, where it fixes xdemos/wincopy
when switching to front buffer rendering.)
2007-07-16 18:23:47 +02:00
Roland Scheidegger
fb3b9060d4
fix segfault with i915 drivers in swrast drawpixels path when resizing windows
2007-07-16 18:23:46 +02:00
Oliver McFadden
d895c5a08f
r300: Use the R300_PVS_UPLOAD_* defines.
2007-07-16 15:42:16 +00:00
Roland Scheidegger
894557d625
get rid of more cliprects...
2007-07-16 17:41:22 +02:00
Oliver McFadden
4013382ea2
r300: Added the clip plane upload defines.
2007-07-16 15:39:12 +00:00
Roland Scheidegger
56cbdfd7d5
more cliprect elimination (swrast span)
2007-07-16 15:53:23 +02:00
Roland Scheidegger
6104044f6b
get rid of more fake cliprects (drawpixel), and enable blit draw with scissor
2007-07-16 15:33:09 +02:00
Oliver McFadden
81c333adbc
r300: Enable the vertprog point size again.
2007-07-16 12:21:38 +00:00
Roland Scheidegger
8b93d9238e
get rid of more cliprects (readpixel)...
2007-07-16 13:57:49 +02:00
Oliver McFadden
03105d7b3e
r300: Corrected position bug with position invariant option. Bug #11594 .
2007-07-16 11:34:40 +00:00
Roland Scheidegger
d69cae95a0
allow blit path for read pixels if pack->alignment isn't 1.
...
pack->alignment doesn't matter usually if the image is sufficiently aligned
anyway. Speeds up some tests/readrate cases by a factor of 100 (since
the pack->alignment default which noone ever bothers to change is 4).
2007-07-16 11:51:08 +02:00
Oliver McFadden
aa9d77ca3c
r300: Removed Vim modeline I left in the file by mistake. :-)
2007-07-16 07:17:22 +00:00
Oliver McFadden
72581241a8
r300: Make sure the modified value of u_temp_i is respected.
2007-07-16 07:12:29 +00:00
Oliver McFadden
87855fb32c
r300: Added a function for vertex program default opcode translation.
2007-07-16 06:38:12 +00:00
Oliver McFadden
ddb74cb443
r300: Clean up the vertex program maximum length check.
2007-07-16 06:33:53 +00:00
Oliver McFadden
d0b3f3ce81
r300: Corrected indenting in r300_vertprog.c.
2007-07-16 06:27:29 +00:00
Oliver McFadden
79773ba13a
r300: Major vertex program code clean up and rework.
2007-07-16 06:16:35 +00:00
Oliver McFadden
b0f0b4044c
r300: Replaced the ugly VERTEX_SHADER_INSTRUCTION typedef.
2007-07-16 05:04:10 +00:00
Roland Scheidegger
99c7e38d83
change back driver change from previous commit
2007-07-15 22:53:59 +02:00
Roland Scheidegger
a1ec23a30f
fix bogus fb/drawable information (fixes xdemos/wincopy)
...
the framebuffer objects attached to drawables can have invalidate state
associated with them, since for the window framebuffer this is per-context
state and not per-fbo state. Since drivers may rely on that information
(otherwise would need to check if currently the window-framebuffer is
bound in a lot of places) fix it up in _mesa_make_current (ugly).
2007-07-15 22:47:42 +02:00
Roland Scheidegger
8172f50419
fix the texture copypixels path
2007-07-15 20:15:19 +02:00
Roland Scheidegger
cd3afa2a95
begin getting rid of fake clip rects (copy_pixel)
2007-07-15 18:17:36 +02:00
Oliver McFadden
9457bf62bb
r300: Gracefully exit after GART memory is exhausted.
2007-07-15 01:17:54 +00:00
Oliver McFadden
393558a933
r300: Disable vertex program point size; it's almost certainly wrong.
...
See the conversation between myself and Tommy Schultz Lassen on mesa3d-dev.
2007-07-14 18:31:29 +00:00
Oliver McFadden
491f646c79
r300: Clean up the vertex program output assignment.
2007-07-14 18:12:04 +00:00
Patrice Mandin
24f85f047b
nouveau: nv10 and nv11,15 are different
2007-07-14 18:54:22 +02:00
Roland Scheidegger
a04056d313
fix assertion, z/stencil swarst readback, (still looks suspicious) copyTexSubimage
2007-07-14 14:24:20 +02:00
Jan Dvorak
5a0f02a394
fix shader/info string length queries (bug 11588)
2007-07-13 16:36:00 -06:00
Brian
f0636d9653
Fix setup.light_twoside determination.
...
When a vertex program is used, use value of GL_VERTEX_PROGRAM_TWO_SIDE.
Otherwise, if FF lighting, use value of GL_LIGHT_MODEL_TWO_SIDE.
2007-07-13 14:28:15 -06:00
Brian
a2e471e05e
press 'f' to toggle front-face winding
2007-07-13 14:25:28 -06:00
Brian
dc313b5783
Fix more polygon winding, culling confusion.
...
If the determinant of the triangle is positive, its winding is CCW (right-handed coord system).
2007-07-13 14:22:46 -06:00
Roland Scheidegger
f022bff5aa
bugfixes (wrt fb updates), cleanups
...
move drawable validation back to where it was now that the driDrawable
information isn't used directly anymore.
Fix bogus fb updates (the context we get for SwapBuffer processing
may not have the drawable being processed attached!)
glthreads behaves a bit better but still not correct.
2007-07-13 20:47:17 +02:00
Brian
2bf4a500de
Fix for-loop in interp() so we don't go out of bounds.
...
Improved comments for that loop.
Added some sanity check assertions regarding vertex layout.
2007-07-13 12:28:42 -06:00
Brian
5810b40d6e
set INTERP_CONSTANT when appropriate
...
Not really signficant now since draw_flat stage copies the provoking
vertex color to all prim verts.
2007-07-13 12:26:09 -06:00