Nian Wu
e01ee3da57
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-19 17:00:19 +08:00
Keith Whitwell
77544d7b7d
fix off-by-one in load_state_immediate
2007-03-18 20:13:45 +00:00
Keith Whitwell
c9e39aeaef
fix typo in subrect_disable packet
2007-03-18 20:13:45 +00:00
Keith Whitwell
07265280a9
fix typo in subrect_disable packet
2007-03-18 20:13:45 +00:00
Miguel Marte
c41d6ab6f0
screen offset changes, bug 9965
2007-03-18 11:08:29 -06:00
Nicolai Haehnle
441f038748
fix assertion in read_depth_pixels()
2007-03-18 11:02:35 -06:00
Oliver McFadden
dd868b4100
r300: Removed the deprecated $XFree86$ CVS keywords.
2007-03-18 16:57:45 +00:00
Oliver McFadden
1062106521
r300: Corrected the string for polygon mode; it wasn't updated from unkXXX.
2007-03-18 16:45:32 +00:00
Ben Skeggs
bcf4f4de76
nouveau: avoid using uninitialised TexSrcUnit.
2007-03-19 00:13:41 +11:00
Xiang, Haihao
bb02092d74
mesa: SWAP_BUFF support when calling DrawPixels(DEPTH_COMPONENT)
...
or TexImage(DEPTH_COMPONENT)
2007-03-18 18:44:51 +08:00
Xiang, Haihao
b6fe1bdd4d
mesa: enhance fxt1_quantize_ALPHA1
...
If possible, let minCol != maxCol
2007-03-18 18:34:21 +08:00
Xiang, Haihao
84081774e6
i965: fix for FXT1 & S3TC texture format
...
choose the right mesa texformat for FXT1 & S3TC
2007-03-18 18:26:16 +08:00
Nian Wu
fd1b1fce3f
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-18 17:00:18 +08:00
Oliver McFadden
cfe984dbd0
Use _mesa_copy_instructions rather than memcpy in _mesa_insert_mvp_code.
2007-03-18 07:35:45 +00:00
Haihao Xiang
ee5b7f0574
fix some format conversion bugs in glGetTexImage(), bug 10288
2007-03-17 09:42:36 -06:00
Nian Wu
38889f5221
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-17 17:00:25 +08:00
Dave Airlie
6a9b0cd0b4
r300: change vendor string to DRI R300 Project
2007-03-17 16:46:24 +11:00
Brian
e5070bc3ca
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.
2007-03-16 11:00:07 -06:00
Brian
7573b58db6
Colortable re-org.
...
The pixel transfer path has three color table lookups.
Use an array [3] to store that info, rather than separate variables.
2007-03-16 09:36:12 -06:00
Brian
d7049431a0
added a renderbuffer comment
2007-03-16 08:36:22 -06:00
Mathias Hopf
f04979ae48
added null xmctx check to XMesaResizeBuffers(), bug 7205
2007-03-16 08:28:34 -06:00
Nian Wu
a02870f4f6
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-16 17:00:24 +08:00
Brian
e348016253
silently ignore DeleteProgram/Shader(id=0)
2007-03-15 16:07:39 -06:00
Brian
7ed292a4e9
in _mesa_GetColorTable, return silently if table size is 0
2007-03-15 16:06:58 -06:00
Oliver McFadden
95764262a7
Fixed a minor typo in the comment near _mesa_copy_instructions.
2007-03-15 21:57:31 +00:00
Oliver McFadden
0c25d9ab19
r300: Added _mesa_copy_instructions.
2007-03-15 20:55:30 +00:00
Oliver McFadden
1195caa274
r300: Renamed r300_vertexprog.c to r300_vertprog.c
2007-03-15 20:39:07 +00:00
Oliver McFadden
0e9ada1087
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.
2007-03-15 19:49:10 +00:00
Oliver McFadden
0d6d80ef3d
r300: Updated R300 to use the new SWIZZLE macros.
2007-03-15 19:09:10 +00:00
Oliver McFadden
51693b22cd
r300: Fixed an unused variable warning and removed some cruft, too.
2007-03-15 18:44:29 +00:00
Oliver McFadden
b3a9a90cdf
r300: Fixed a printf conversion warning.
2007-03-15 18:30:33 +00:00
Oliver McFadden
7f08dd3fc6
r300: Fixed "no previous prototype for 'r300RefillCurrentDmaRegion'" warning.
2007-03-15 18:30:33 +00:00
Brian
fc6b8f2d30
added SWIZZLE_XXXX, YYYY, etc. macros
2007-03-15 11:51:54 -06:00
Oliver McFadden
4e4ab2a62b
Committed Rune Petersen's fragment.position patch (Bug #10024 ) plus a few small
...
corrections.
2007-03-15 17:35:34 +00:00
Brian
4d2eb637a2
no-op clear if buffer width or height is zero (bug 7205)
2007-03-15 11:16:41 -06:00
Brian
038e981cac
add some rb->Data null ptr checks (bug 7205)
2007-03-15 11:11:41 -06:00
Brian
90563d39cb
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-03-15 09:03:03 -06:00
Brian
0cfdf432e4
implement byteswapping for all multi-byte types in _mesa_pack_rgba_span_float(), bug 10298
2007-03-15 09:02:14 -06:00
Keith Whitwell
4a7fe4fcfa
Fix off by one error in immediate state packet size.
2007-03-15 10:29:38 +00:00
Nian Wu
d63eef4b86
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
2007-03-15 17:00:22 +08:00
Brian
32d196820f
pixelmap code simplification
2007-03-14 14:56:39 -06:00
Brian
b6adf336f4
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.
2007-03-14 14:33:46 -06:00
Brian
62b4601e53
s/Tranpose/Transpose/
2007-03-14 13:34:30 -06:00
Brian
3049946fa7
clear the b->frontxrb->drawable field in xmesa_free_buffer(), see bug 7205
2007-03-14 12:52:53 -06:00
Brian
46fe008778
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-03-14 12:43:26 -06:00
Brian
47e0b606a8
move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205
2007-03-14 12:42:30 -06:00
Brian
565d097d8f
continue prev check-in: save ptr to slang_function for SLANG_OPER_CALL
2007-03-14 11:07:32 -06:00
Brian
2dc3e94470
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.
2007-03-14 10:49:35 -06:00
Brian
b1a955b518
make _slang_typeof_function() static
2007-03-14 10:16:18 -06:00
Brian
b01f146fd0
remove old assertion
2007-03-14 08:56:01 -06:00