Compare commits

...

9085 Commits

Author SHA1 Message Date
Brian
22d9132081 disable printing shader program debug info 2007-03-26 10:15:02 -06:00
Brian
d619cceea4 merge of glsl-compiler-1 branch 2007-03-26 10:13:02 -06:00
Michel Dänzer
76f3b66e04 i915tex: Make sure renderbuffers don't get deleted when flipping them.
Since the recent renderbuffer refcounting fixes it's no longer sufficient to
just remove the old renderbuffer from the framebuffer and then add the new one
because the former may decrease the reference count to 0 and delete the old
renderbuffer.
2007-03-26 17:38:58 +02:00
Brian
e71c34aaa1 disable free() until other issues can be fixed... 2007-03-26 09:24:30 -06:00
Brian
b9fbedd601 fix mem leak, add comments 2007-03-26 09:23:44 -06:00
Ben Skeggs
8051c95a7e nouveau: match drm version bump 2007-03-26 21:31:43 +10:00
Brian
42aaa548a1 Fix some renderbuffer reference counting issues. Also fixes a mem leak. 2007-03-25 10:39:36 -06:00
Brian
6fda763989 destroy window on exit 2007-03-25 10:25:29 -06:00
Xiang, Haihao
a1ea7812b2 i965: The given urb layout(maximal size of urb entries and the
values for nr of entries) should meet the requirement.
2007-03-25 21:40:58 +08:00
Xiang, Haihao
bb59d81d2d Color3iv: set the alpha value to 1.0 2007-03-25 21:31:36 +08:00
Nicolai Haehnle
8a4546b561 r300: Whitespace cleanup in r300_texmem.c 2007-03-25 14:57:56 +02:00
Nicolai Haehnle
9db583e7e4 r300: Whitespace cleanup in r300_texstate.c 2007-03-25 14:57:49 +02:00
Nicolai Haehnle
7143c61283 r300: Fix regression: unnecessary node indirection
The texture_rectangle fix introduced a bug where every texture instruction
caused a new indirection.
2007-03-25 13:04:03 +02:00
Brian
bb0393a0cd fix mem leak 2007-03-24 16:44:20 -06:00
Brian
9fe342d1e6 disable free(var->aux) -- can lead to segfault 2007-03-24 16:43:44 -06:00
Brian
cfdd07d7d3 fix mem leak 2007-03-24 16:26:51 -06:00
Brian
1968444bed fix some mem leaks 2007-03-24 16:22:35 -06:00
Brian
935f93f966 Free shader-related context state: _mesa_free_shader_state() 2007-03-24 16:20:02 -06:00
Brian
3493e867e9 free prog->Attributes in _mesa_delete_program() 2007-03-24 16:18:13 -06:00
Brian
49134e8e53 fix mistake in _slang_free_ir() 2007-03-24 15:29:10 -06:00
Dave Airlie
74ceaf545f nouveau: implement nv20Clear and nv20Scissor
Still crashes out on scissor regs
2007-03-25 07:09:02 +10:00
Nicolai Haehnle
f27991c916 r300: Fix texture coordinate calculation for rectangle textures
R300 hardware takes texcoords in the range 0..1 even for rectangle
textures. Previously, the necessary texcoord conversion was applied
to the texture coordinate during vertex processing in a render stage.

This is obviously wrong when fragment programs are used, which can
calculate arbitrary coordinates for TEX instructions. Therefore,
we now inject an appropriate MUL instruction before a TEX that
reference a rectangle texture.
2007-03-24 19:09:44 +01:00
Nicolai Haehnle
0c3ae2ea7f r300: No assertion when accessing incomplete texture images.
There used to be an assertion when a fragment program accesses an incomplete
texture image. Work around this assertion.
Note: I am unsure whether this workaround produces the desired result
(0,0,0,1) on all hardware.
2007-03-24 18:11:37 +01:00
Brian
0e71d08e8d Properly free the slang_ir_node->Store data (use ref counting). 2007-03-24 10:18:14 -06:00
Brian
b50b036ffb When computing render_inputs_bitset, omit primary color if we have a fragment program and it doesn't need FRAG_ATTRIB_COL0. Silences valgrind warnings. 2007-03-24 10:16:49 -06:00
Brian
dc3015f157 move some code into new slang_ir.c file 2007-03-24 09:40:20 -06:00
Brian
b2bc563142 IR utility functions 2007-03-24 09:39:24 -06:00
Nicolai Haehnle
d4dd5a95a8 r300: Fix: KIL instruction don't require textures
When no textures were enabled, a KIL instruction triggered an assertion
in r300_setup_rs_unit.
2007-03-24 14:43:06 +01:00
Nicolai Haehnle
8f90822b72 swrast: Fix crash when sampling from a non-existing texture object 2007-03-24 14:42:49 +01:00
Ben Skeggs
ea3d11a3d8 nouveau: some swtcl fixes 2007-03-24 22:24:00 +11:00
Brian
8e1c3bd0b4 Implement alpha buffer copy for SwapBuffers().
Nicolai writes:
When the pixmap pixel format has no alpha channel, the x11 driver
(software rendering) adds a wrapped alpha channel on request.

During SwapBuffers, this alpha channel is not copied from back to
front, which means that the front buffer doesn't really contain the
contents that the back buffer previously contained.

A subsequent glReadPixels from the front buffer will return an
incorrect result. The following patch attempts to fix this.
2007-03-23 18:01:31 -06:00
Brian
8f9db0f81c document internal compiler options 2007-03-23 17:49:19 -06:00
Brian
d1934c2065 Fix issues related to the 'continue' statement.
IR_LOOP now has two children: the body code, and the tail code.
Tail code is the "i++" part of a for-loop, or the expression at the end
of a "do {} while(expr);" loop.
"continue" translates into: "execute tail code; CONT;"
Also, the test for infinite do/while loops was incorrect.
2007-03-23 17:48:42 -06:00
Brian
81767eead9 consolidate some code 2007-03-23 17:45:53 -06:00
Brian
63556fa994 Add the ability to generate programs that doesn't use condition codes.
ctx->Shader.EmitCondCodes determines if we use condition codes.
If not, IF statement uses first operand's X component as the condition.
Added OPCODE_BRK0, OPCODE_BRK1, OPCODE_CONT0, OPCODE_CONT1 to handle
the common cases of conditional break/continue.
2007-03-23 14:47:46 -06:00
Brian
bf020d8d7f minor tweaks 2007-03-23 14:44:34 -06:00
Brian
2bdac09d16 updated comment 2007-03-23 10:46:08 -06:00
Nicolai Haehnle
654a308439 r300: Whitespace cleanup (remove trailing spaces) 2007-03-23 17:39:28 +01:00
Brian
fe20a619cf updated comment 2007-03-22 16:07:43 -06:00
Brian
e6aeb24b23 Overhaul emit_compare() function.
Previously, comparing vec2, vec3, vec4 was broken.
Added IR_EQUAL, IR_NOTEQUAL nodes/operators to compute boolean
equality/inequality vs. IR_SEQUAL/IR_SNEQUAL which work component-wise.
Use IR_EQUAL/IR_NOTEQUAL for the == and != operators.
To compute vec4 equality, use SNE, DP4, SEQ instruction sequence.
2007-03-22 16:07:14 -06:00
Brian
0aad9e2627 First pass at implementing structure compares.
Need to improve this.  There may be holes in a structure so we can't
just blindly compare the full 4-float registers.
2007-03-22 09:15:39 -06:00
Brian
12229f119d use _mesa_copy_instructions() 2007-03-22 09:11:26 -06:00
Brian
1bf81e3c5d In _mesa_add_unnamed_constant() and _mesa_lookup_parameter_constant() allow swizzleOut==NULL.
There are times when we don't want to allow swizzling when searching for or
adding vector constants.  Passing NULL for swizzleOut disables swizzling.
This fixes a constant/swizzle bug in link_uniform_vars().
2007-03-22 09:07:27 -06:00
Brian
1936b25ebd print conditional writemask, if enabled 2007-03-22 09:04:18 -06:00
Brian
002762b13a use _mesa_alloc_instructions() 2007-03-22 08:51:34 -06:00
Brian
1240eb2683 use _mesa_copy_instructions() 2007-03-22 08:50:20 -06:00
Alan Hourihane
985a2eff82 Ensure we have a valid ReadBuffer for CopyTexSubImage, and
if not bail accordingly.

Previously we'd only do this test on compressed textures.
2007-03-22 14:28:18 +00:00
Xiang, Haihao
01b7f2ab2e fix for bug#10339
StateFlags has been updated in _mesa_add_state_reference
2007-03-22 11:01:51 +08:00
Brian
629ec2b06b added SWIZZLE_XYZW 2007-03-21 15:40:54 -06:00
Brian
2500d82d0d Support for user-defined structures.
struct == and != operators not finished yet.  Struct assignment works though.
2007-03-21 15:40:39 -06:00
Brian
97c9b3ecc6 disable apparently unused code 2007-03-21 15:38:46 -06:00
Brian
e02b989ff9 indent 2007-03-21 14:45:34 -06:00
Brian
23d31efc16 merge from master 2007-03-21 11:57:30 -06:00
Brian
180cc2f845 disable assertion 2007-03-21 11:41:41 -06:00
Brian
88db19a484 document 1D convolution fix 2007-03-21 09:45:58 -06:00
Brian
249b451d20 1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image transfers. 2007-03-21 09:44:03 -06:00
Roland Scheidegger
c5fe807e42 fix copy and paste bug from last commit in fog generation code for GL_LINEAR fog 2007-03-21 13:19:02 +01:00
Ben Skeggs
4b5d6c0435 nouveau: update for drm interface changes (0.0.5) 2007-03-21 17:54:57 +11:00
Ben Skeggs
6cadebbb67 nouveau: SwapBuffers() needs to perform a glFlush() 2007-03-21 15:07:12 +11:00
Xiang, Haihao
704cd61120 mesa: revert f9f79c8d77
to fix #10232

Table6.1(in gl2.1) has been applied for glGetTexImage
before calling into _mesa_pack_rgba_span_float.
2007-03-21 10:50:19 +08:00
Nicolai Haehnle
4bafc547df r300: Remove the program-global const_sin index
The index is no longer necessary to share constants between multiple
SIN/COS/SCS instructions inside a single fragment program, and storing
a tiny implementation detail like this in the fragment_program structure
itself was just nasty.
2007-03-21 00:58:02 +01:00
Nicolai Haehnle
cbe38dc0ce r300: Whitespace cleanup (remove trailing spaces) 2007-03-20 18:40:09 +01:00
Xiang, Haihao
cf4272d256 fix for bug#10347
not sure which brw surface for DXT3 & DXT5, so restore
the previous choice.(changed in commit
84081774e6)
2007-03-20 22:12:03 +08:00
Alan Hourihane
bec665d5b5 use passed target parameter 2007-03-20 13:15:58 +00:00
Ben Skeggs
ecb1a1c82f nouveau: fix typo 2007-03-20 16:08:14 +11:00
Ben Skeggs
4185037af2 nouveau: fail translate if we use too many params somehow 2007-03-20 16:08:07 +11:00
Ben Skeggs
9622a634f6 nouveau: NVSDBG macro 2007-03-20 16:08:01 +11:00
Nicolai Haehnle
61821a41c0 r300: Cleanup fragment program constant allocation, share constants
The constant/parameter allocation was significantly simplified, removing
one unnecessary copy operation of parameters. The dirty state tracking is
unchanged and far from optimal, since all state is always re-fetched.

Constants and parameters are now emitted only once, which significantly
reduces the resource pressure on larger programs.
2007-03-19 23:59:59 +01:00
Nicolai Haehnle
5a65478783 r300: Fix special case (tmp.x <= 0) in fragment program LIT instruction
Also, fix a typo in a related comment.
2007-03-19 22:29:34 +01:00
Nicolai Haehnle
b3acba87d7 r300: Clear fragment program instruction slots on first use
Make sure that instruction slots are fully initialized with NOPs during
find_and_prepare_slot(). This fixes a bug when a fragment program was
translated more than once (e.g. due to a second call to glProgramStringARB).

This partially fixes glean/fragProg1.
2007-03-19 22:29:21 +01:00
Brian
fdcbbeb55e Properly compute render_inputs_bitset when using a vertex program/shader.
This fixes a performance regression introduced early in glsl-compiler-1 work.
2007-03-19 14:44:15 -06:00
Nicolai Haehnle
826815a5d2 r300: Dump fragment program after translation if RADEON_DEBUG=pixel is set 2007-03-19 20:02:19 +01:00
Nicolai Haehnle
7b992d024b r300: Whitespace cleanup (remove trailing spaces) 2007-03-19 19:49:06 +01:00
Nicolai Haehnle
c4bf863f4c r300: Fix WRITEMASK handling when writing to result.depth
This is a necessary change to emit the right instructions when writing
to result.depth.

However, even with this test, Z-write doesn't work properly, and I don't
fully understand why. In addition to this, we'll at least have to disable
early-Z, but even that doesn't seem to be enough.
2007-03-19 19:48:58 +01:00
Nicolai Haehnle
b645e8c96d r300: Streamlined fragment program LIT implementation
Fix a bug in the LIT implementation (clamp exponent to 128, not 0.5)
and change the implementation around. In theory, the new implementation
needs as little as 5 instruction slots. Unfortunately, the dependency
analysis in find_and_replace_slot is not strong enough to look at
individual components of a register yet.
2007-03-19 19:10:21 +01:00
Nicolai Haehnle
ff6ab9b45b r300: Fix fragment program reordering
Do not move an instruction that writes to a temp forward past an instruction
that reads the same temporary.
2007-03-19 18:38:07 +01:00
Nicolai Haehnle
ec1a77c864 r300: Fragment program dumps format tex instructions 2007-03-19 18:38:07 +01:00
Nicolai Haehnle
a8e65a010c r300: Fix hw fragment program dump
Dumps of fragment programs were incorrect when the program consisted of multiple
nodes.

Also, improved the formatting a bit.
2007-03-19 18:38:07 +01:00
Nicolai Haehnle
7b430acd71 r300: Fix fragment program instruction pairing and register allocation
There were a number of bugs related to the pairing of vector and scalar
operations where swizzles ended up using the wrong source register,
or an instruction was moved forward and ended up overwriting an aliased
register.

The new algorithm for register allocation is quite conservative and may
run out of registers before necessary. On the plus side, It Just Works.

Pairing is done whenever possible, and in more cases than before, so
in practice this change should be a net win.
2007-03-19 18:38:07 +01:00
Michel Dänzer
07db8c9115 i915tex: The intended triple buffering fix.
Making modifications while the editor spawned by git-commit was suspended
didn't have the intended effect.
2007-03-19 18:34:27 +01:00
Michel Dänzer
9b42100c04 i915tex: Fix triple buffering after recent Mesa core changes.
Remove superfluous _mesa_resize_framebuffer call which is now harmful because
it causes the third renderbuffer to have width/height 0, so Mesa refuses to
render to it.

In the long term, it would be nice to remove the hack in
intel_alloc_window_storage in favour of a proper Mesa interface for flipping
between more than two colour buffers.
2007-03-19 17:23:44 +01: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
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
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
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
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
Brian
52363954bf more bug fixing, error checking 2007-03-13 16:50:24 -06:00
Brian
98650bdf89 fix a number of issues in _mesa_uniform() 2007-03-13 16:32:48 -06:00
Brian
5186529e57 remove bogus assertion 2007-03-13 16:31:30 -06:00
Brian
fdf513e07a document some bug fixes, lots of new features 2007-03-13 16:12:23 -06:00
Brian
8d9db3dd03 fix ctx->Pixel.PostConvolutionScale/Bias subscript bugs 2007-03-13 16:07:04 -06:00
Brian
fd08463dea Check for, simplify vec2/3/4(x). Only do call adapting for constructors. 2007-03-13 15:58:40 -06:00
Brian
c7b2cce418 improve literal printing 2007-03-13 15:57:09 -06:00
Brian
000b2899b9 disable some debug output 2007-03-13 15:55:54 -06:00
Brian
a49a865cf5 better error msg for undefined function, disable some debug output 2007-03-13 15:55:41 -06:00
Brian
948c60badc get rid of float_multiply, float_add, float_divide 2007-03-13 15:00:14 -06:00
Roland Scheidegger
a6cc9ab493 sync up t_vp_build.c brw_vs_tnl.c a bit
Bring over the optimizations for fog and normalized spot dir
from t_vp_build.c to brw_vs_tnl.c. Likewise, port a fix for point size
calc from brw_vs_tnl.c to t_vp_build.c (use ABS(eyez) instead of -eyez). Leave
the now differing point size calcs alone though, not sure what's better (it's
basically MOV, ABS, MUL, DP3 vs. ABS, MAD, MAD).
2007-03-13 19:04:28 +01:00
Brian
d8070889d7 alloc an extra byte in _mesa_ShaderSourceARB() to silence a valgrind warning 2007-03-13 11:00:21 -06:00
Brian
c000843a14 be smarter about which fragment attribs are interpolated before running frag progs 2007-03-13 10:58:48 -06:00
Brian
da55430952 comment about SPAN_* vs FRAG_BIT_* values 2007-03-13 10:58:23 -06:00
Brian
17ad1d12eb Check if FRAG_RESULT_COLR is written and update span->interpMask, arrayMask.
Also, fix an assertion.
2007-03-13 10:53:16 -06:00
Brian
8b9842a256 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.
2007-03-13 10:49:08 -06:00
Roland Scheidegger
37e6f760fd enable ARB_vertex_buffer_object for more dri drivers
ARB_vertex_buffer_object looks like a useful extension even for old chips.
The drivers should not need any code to be able to use this extension since
they just use mesa's vbo code anyway.
Newly enabled for i810, mach64, mga, r128, radeon, savage, sis and unichrome.
2007-03-13 17:44:22 +01:00
Brian
7265e6928e properly compute ctx->Texture._EnabledCoordUnits 2007-03-13 10:28:26 -06:00
Oliver McFadden
4c18d9056b r300: Renamed the CACHE_CTLSTAT values to include UNKNOWN in the name; not
enough information is known about them to be sure as to what the values mean.
2007-03-13 14:48:29 +00:00
Roland Scheidegger
14f0b7ea98 use movdqu instead of movdqa for unaligned load avoiding a segfault (bug 10265) 2007-03-13 13:44:23 +01:00
Oliver McFadden
eb4db4c4ec Add defines for the values written to R300_RB3D_ZCACHE_CTLSTAT.
Note that just like the values written to R300_RB3D_DSTCACHE_CTLSTAT these
values are really unknown; ideally more reverse engineering should be done to
determine what these values mean and when they should be set.
2007-03-13 06:24:56 +00:00
Oliver McFadden
19fbe9732c Documented the value written for R300_TX_CNTL cache flush. 2007-03-13 06:10:23 +00:00
Xiang, Haihao
53f83b435c mesa: _mesa_unpack_image
1. take packed pixel data as a component
2. fix for GL_BITMAP when compiling glTexImage, etc into
a display list:  a. flip byte if lsbFirst is true since
DefaultPacking->lsbFirst is false. b. handle SkipPixels
2007-03-13 13:39:34 +08:00
Oliver McFadden
cd66604756 Corrected values written to R300_RB3D_DSTCACHE_CTLSTAT to either
R300_RB3D_DSTCACHE_02 or R300_RB3D_DSTCACHE_0A, rather than hexadecimal values.
2007-03-13 01:31:38 +00:00
Oliver McFadden
0c750ca98d Guess another unknown register used for R300 pacification. 2007-03-13 00:48:17 +00:00
Brian
b3a22d0ed6 Implement GL_ARB_texture_rectangle support
This includes the sampler2DRect and sampler2DRectShadow types and
the texture2DRect(), texture2DRectProj(), etc. built-in functions.
2007-03-12 17:29:50 -06:00
Michel Dänzer
708d836e6b i915tex: Don't crash when intel_fb->color_rb[i] is NULL.
This can be the case on some systems when running glxinfo.
2007-03-12 19:08:28 +01:00
Brian
8946d7f029 Add array bounds checking, fix memleaks, add null ptr checks. 2007-03-12 10:52:52 -06:00
Brian
d2a6f43eaf extra stuff for drawbuffers test 2007-03-12 10:30:36 -06:00
Brian
17fb7821d7 clean-up, simplify _mesa_image_row_stride() 2007-03-12 09:50:27 -06:00
Brian
c1a5447337 take GL_UNPACK_ALIGNMENT into account in _mesa_image_row_stride() for GL_BITMAP type (bug 10261) 2007-03-12 09:50:27 -06:00
Alan Swanson
d0a3400f66 r200: Simplify r200SetCliprects like radeonSetCliprects in radeon and r300. 2007-03-12 10:03:01 +01:00
Alan Swanson
33ea9dccaf r200: Adapt cliprect fixes from r300. 2007-03-12 09:59:45 +01:00
Alan Swanson
88501887e4 radeon: Adapt cliprect fixes from r300. 2007-03-12 09:59:28 +01:00
Brian
3f7ef618b6 added drawbuffers.c 2007-03-11 17:30:13 -06:00
Brian
15aa7aaa93 add NULL ptr check 2007-03-11 17:29:54 -06:00
Brian
ccb80d7ec4 Test the GL_ARB_draw_buffers extension.
Also requires GL_EXT_framebuffer_object and OpenGL 2.0 (for GLSL).
2007-03-11 17:03:29 -06:00
Brian
1c09bcfdda 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.
2007-03-11 17:00:39 -06:00
Xiang, Haihao
61ec23cc63 fix for bug#10196
Compute half if LOCAL_VIEWER is enabled and the light is
a directional source.
2007-03-11 22:41:26 +08:00
Aapo Tahkola
69e57cf6ae Guess another unknown register in R300 command buffer initialization. (Oliver McFadden) 2007-03-11 11:47:03 +02:00
Oliver McFadden
e64166703a Renamed some of the unkXXX variables in the command buffer init
ialization code.

Note that there are still plenty of actual unknown variables left that should
probably be deciphered.

There are a number of things incomplete in the driver; the different polygon
offset modes (line, point, etc), the other texture filter, texture chroma key,
etc. These should probably be fixed in the future, or at least added to the TODO
list.
2007-03-11 12:18:27 +11:00
Brian
d23dd812ad Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1 2007-03-10 14:07:28 -07:00
Brian
7d39c1ae76 Fix TEXREL issues.
Patch submitted by Christoph Brill.
See http://www.gentoo.org/proj/en/hardened/pic-fix-guide.xml
2007-03-10 11:50:50 -07:00
Brian
823c041fde check for EXT_blend_equation_separate for 2.0 2007-03-10 11:48:59 -07:00
Brian
10b5895597 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.
2007-03-10 11:30:19 -07:00
Brian
1fcb4ecc07 clean-up formatting 2007-03-10 10:56:06 -07:00
Brian
c9872b80c8 add NULL ptr check in emit_cond() 2007-03-10 10:37:18 -07:00
Michel Dänzer
38f7f81518 i915tex: Fix build against libdrm git... 2007-03-10 17:12:58 +01:00
Michel Dänzer
beffb4e88c i915tex: Fix intel_wait_flips being declared implicitly. 2007-03-10 16:40:22 +01:00
Michel Dänzer
97775f9904 i915tex: Fix build against released version of libdrm. 2007-03-10 16:08:11 +01:00
Stephane Marchesin
ced8870a6a nouveau: fix nv04 swtcl. 2007-03-10 13:46:26 +01:00
Stephane Marchesin
4f12b37a56 nouveau: fix the nv04 swtcl code. 2007-03-10 01:30:34 +01:00
Stephane Marchesin
581a594033 nouveau: oops don't debug by default. 2007-03-10 01:30:34 +01:00
Stephane Marchesin
df1c3ff3dd nouveau: some fixes to the nv04 state code. 2007-03-10 01:30:33 +01:00
Stephane Marchesin
e61f674844 nouveau: add a fifo size debug check. 2007-03-10 01:30:33 +01:00
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
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
Brian
e61ec95deb additional error detection 2007-03-07 08:55:42 -07:00
Brian
cec81eef31 check for null program ptrs in _mesa_uniform() 2007-03-07 08:04:06 -07:00
Brian
55821d021d Generate an error if the vertex shader does not write to gl_Position. 2007-03-07 07:52:24 -07:00
Brian
2282d81536 destroy window during cleanup 2007-03-06 16:33:00 -07:00
Brian
6cb0aa12b8 more integer arithmetic updates 2007-03-06 16:32:03 -07:00
Brian
0af1c6b5d1 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-03-06 16:27:23 -07:00
Brian
e69da9d02e explicit calls to _mesa_unreference_framebuffer() not always needed now 2007-03-06 16:26:22 -07:00
Brian
1a6baf092b unreference old framebuffer, if needed, in _mesa_reference_framebuffer() 2007-03-06 16:26:02 -07:00
Brian
955906aa64 fix renderbuffer mem leak 2007-03-06 16:25:07 -07:00
Brian
37fd6be411 formatting fix 2007-03-06 16:24:48 -07:00
Brian
e10a1457e8 fix some int arithmetic problems 2007-03-06 14:07:48 -07:00
Ian Romanick
fa8961069c Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa 2007-03-06 11:50:33 -08:00
Ian Romanick
091be11190 Fix cut-and-paste error in the name of GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB. 2007-03-06 11:50:21 -08:00
Brian
28ab1125c2 more DEBUG_PROG code 2007-03-06 12:15:30 -07:00
Brian
c6d930a114 fix vert/frag typo 2007-03-06 11:53:27 -07:00
Brian
a510bc3ee1 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.
2007-03-06 10:07:59 -07:00
Brian
593802c0b0 Take care of texObj reference in _mesa_free_framebuffer_data() 2007-03-06 09:49:15 -07:00
Brian
330d7e2080 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-03-06 09:03:18 -07:00
Michel Dänzer
6f9b1afc86 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.
2007-03-06 13:22:35 +01:00
Xiang, Haihao
1c70cde888 fix for bug#10182
call _mesa_dereference_framebuffer instead of _mesa_dereference_framebuffer
in i810, i915, i915tex, i965 drivers.
2007-03-06 15:47:37 +08:00
Xiang, Haihao
a783713432 fix for bug#9971
call swsetup_Wakeup before falling back to software rendering
2007-03-05 22:18:21 +08:00
Keith Whitwell
7ecdfb2f08 Propogate UsesKill information. 2007-03-04 21:50:51 +00:00
Christoph Bill
9557706404 r300: Use register name & add a register about shading. 2007-03-01 21:11:45 +01:00
Christoph Bill
0d2a68fc61 r300: Use reg definition when available & add missing reg definition. 2007-03-01 20:45:04 +01:00
Christoph Bill
ad3f2107ed 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).
2007-03-01 20:40:25 +01:00
Rune Petersen
5cb01764f6 Optimize cos&sin instruction a bit more. 2007-03-01 20:36:19 +01:00
Brian
a8ba888a35 move oldFb decl into tighter scopes 2007-03-01 09:40:21 -07:00
Brian
9fbb2e9e76 fix bad n_dot_h normalization code (bug 9977), plus clean-up the code in general 2007-03-01 09:17:01 -07:00
Brian
d592eaeb83 fix clipping, display name, warnings 2007-03-01 07:56:11 -07:00
Brian
887d3c67cb s/unsigned int/size_t/ (bug 10135) 2007-03-01 07:42:42 -07:00
Brian
03b9e16507 include assert.h 2007-03-01 07:39:27 -07:00
Brian
38a88db1fc Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-28 11:58:30 -07:00
Brian
9f37be694e s/ARB/MESA/ in extension check (bug 10126) 2007-02-28 11:58:06 -07:00
Michel Dänzer
0609b6afa8 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.
2007-02-28 17:46:07 +01:00
Michel Dänzer
3c578455e1 i915tex: Check that intel_rb is valid before trying to add it to an fbo. 2007-02-28 17:42:54 +01:00
Michel Dänzer
edf676cc5a i915tex: Also update intel_rb->vbl_pending when scheduled swap is not a flip. 2007-02-28 16:05:49 +01:00
Ben Skeggs
afa780c09d nouveau: drm interface changes 2007-02-28 15:31:28 +11:00
Brian
07e62084bb info about how the compiler works 2007-02-27 16:45:40 -07:00
Brian
59e56ee3e5 fix comment 2007-02-27 11:09:48 -07:00
Brian
f30e312763 assert that fb->RefCount==0 in _mesa_free_framebuffer_data() 2007-02-27 11:09:28 -07:00
Brian
0e1bd23025 s/matrix_stack/gl_matrix_stack/ and s/mesa_list_state/gl_dlist_state/ 2007-02-27 09:54:50 -07:00
Brian
2cf8d24131 remove unused DriverMgrCtx 2007-02-26 18:35:34 -07:00
Brian
fa4d036424 Add EmitHighLevelInstructions, EmitComments booleans to gl_shader_state.
These control code generation options.  May be overridden by drivers, debuggers, etc.
2007-02-26 18:33:50 -07:00
Brian
4f26a52908 re-enable var scope destruct in slang_operation_destruct() 2007-02-26 18:08:09 -07:00
Brian
553fe132d4 Fix a few bugs in slang_operation variable scoping. Seems to fix a double-free. 2007-02-26 18:07:26 -07:00
Brian
aa6f4241f8 formatting fixes 2007-02-26 17:32:45 -07:00
Brian
e21096b07c fix mem leak 2007-02-26 17:05:52 -07:00
Brian
b58ea057fe fix mem leak in _mesa_ShaderSourceARB() 2007-02-26 17:00:06 -07:00
Brian
4b8d75e2e6 fix logic for reporting errors 2007-02-26 16:32:00 -07:00
Brian
f446e58e45 disable execute bit 2007-02-26 15:13:34 -07:00
Brian
6817407d49 fix error flagging 2007-02-26 15:06:56 -07:00
Brian
365f8fb0dd re-enable some code 2007-02-26 15:02:36 -07:00
Brian
ed0ae62ad7 Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1 2007-02-26 14:34:57 -07:00
Brian
ca279b80e6 Remove old error logging code. New slang_log.[ch] files. 2007-02-26 14:33:52 -07:00
Brian
c4ac5ac9d7 Overhaul of error handling. 2007-02-26 14:32:53 -07:00
Brian
7f01ef171f Overhaul of error logging. 2007-02-26 14:32:29 -07:00
Brian
e63c7e0893 Use new slang_emit_info struct for passing context info around. 2007-02-26 14:22:05 -07:00
Brian
25ea5ea27e Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1 2007-02-26 13:11:20 -07:00
Brian
928a70e435 Rewrite code related to buffer destruction.
Do proper reference counting so that we don't wind up with dangling
references to deleted windows/framebuffers.  Should help with bug 7205.
2007-02-26 11:39:17 -07:00
Brian
f30e8a4bdf if renderbuffer ptr is null, just return 2007-02-26 11:37:52 -07:00
Brian
e6a9381f78 Do proper framebuffer refcounting in _mesa_make_current().
Also, added DeletePending field to gl_framebuffer used when a window has been
deleted, but there still may be rendering contexts attached to the
gl_framebuffer object.
2007-02-26 11:37:37 -07:00
Brian
344c3f7379 updated version with new Khronos license/copyright 2007-02-26 09:19:32 -07:00
Panagiotis Papadakos
1a72c8ed3f s/pdp/prp/ in DoBindContext() 2007-02-26 07:59:14 -07:00
Panagiotis Papadakos
3528d61820 add missing param to _mesa_warning() 2007-02-26 07:57:31 -07:00
Brian
46d4880201 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-26 07:56:43 -07:00
Brian
4e53ce81cf remove unneeded includes 2007-02-25 20:05:22 -07:00
Brian
3c1c999226 update comments 2007-02-25 19:11:44 -07:00
Brian
313d50e903 fix bounds checking in get_register_pointer() 2007-02-25 19:01:16 -07:00
Brian
b85d4d61a7 define and use MAX_PROGRAM_ADDRESS_REGS 2007-02-25 18:56:57 -07:00
Brian
33eac56e4a Add EnvParams field to gl_program_machine, avoid passing ctx to a bunch of functions. 2007-02-25 18:52:41 -07:00
Brian
6774f32adb simplify _mesa_get_program_register() 2007-02-25 18:39:46 -07:00
Brian
21bcb2e1f6 s/GetFragmentProgramRegister/GetProgramRegister/ 2007-02-25 18:35:47 -07:00
Brian
cfd0011f2f minor clean-ups in _mesa_execute_program() 2007-02-25 18:30:45 -07:00
Brian
8b34b7da41 remove 'maxInst' parameter from _mesa_execute_program() 2007-02-25 18:26:50 -07:00
Brian
085d7d59f0 remove unused 'element' parameter from _mesa_execute_program() 2007-02-25 18:23:37 -07:00
Brian
12fd8faa5d s/attribs/results/ 2007-02-25 18:08:16 -07:00
Brian
29796b62bd remove unused VaryingPtr 2007-02-25 17:33:46 -07:00
Brian
e71a33bbf8 Optimize the loop for copying output results. 2007-02-25 17:29:00 -07:00
Brian
f68067e101 add texture rotation 2007-02-25 17:24:40 -07:00
Aapo Tahkola
c080123998 Fix #10071 - wrong max_index in vbo draw_prims. (Papadakos Panagiotis) 2007-02-26 01:51:39 +02:00
Brian
9854a17f29 only copy used outputs 2007-02-25 12:47:25 -07:00
Brian
21625d729c output texcoord in vertex program 2007-02-25 12:46:56 -07:00
Brian
9d8df47996 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-24 18:29:57 -07:00
Brian
32fbbf38b4 Revert "option to test mipmapping"
This reverts commit a127537efb.
Meant to do this on the trunk.
2007-02-24 18:27:46 -07:00
Brian
a127537efb option to test mipmapping 2007-02-24 18:20:35 -07:00
Brian
d9fb113e05 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-24 18:15:45 -07:00
Brian
53170942e3 Fix broken cubemap mipmap layout (the cubemap.c demo was segfaulting).
In i915_miptree_layout() change the width, height parameters that are passed
to intel_miptree_set_level_info().  As it was, the width, height values were
larger than the source image dimensions and we segfaulted in memcpy() when
copying the original texture data into the texture buffer region.
This fix should probably be checked by someone more familiar with the code (Keith?)
2007-02-24 18:14:53 -07:00
Brian
aeaad937b9 clean-up, comment code 2007-02-24 18:11:09 -07:00
Brian
5cd30a2b20 make src ptr const 2007-02-24 18:10:41 -07:00
Brian
fbc4929185 add missing code for newer STATE_INTERNAL items 2007-02-24 17:00:50 -07:00
Brian
efcfdbd4d1 Undo some changes to _mesa_UpdateTexEnvProgram(). Fixes broken i915 texturing. 2007-02-24 15:51:41 -07:00
Brian
292a80466d Outputs[] array wasn't large enough, define MAX_PROGRAM_OUTPUTS, new assertions. 2007-02-24 15:49:54 -07:00
Brian
5e80c62f31 Remove unneeded _Fragment/VertexShaderPresent fields, update comments. 2007-02-24 15:39:37 -07:00
Brian
197af3dc32 Use prog_execute.c to run vertex programs until t_vb_arbprogram.c is updated to
handle branch instructions, etc.
2007-02-24 11:16:58 -07:00
Brian
824dcd4399 remove comment 2007-02-24 11:15:27 -07:00
Brian
761728afe8 Fix assertion in get_register_pointer(), fix EXP case.
Note that GL_ARB_v_p and GL_NV_v_p define the z component of the EXP instruction
differently.  We follow the ARB extension.
2007-02-24 11:14:57 -07:00
Brian
f183a2d7ea added ARL, EXP, LOG, relative indexing 2007-02-23 17:14:30 -07:00
Brian
a2786a97d7 add some missing cases in _mesa_program_state_string() 2007-02-23 17:13:30 -07:00
Brian
f1390a3424 fix fog breakage 2007-02-23 17:11:01 -07:00
Brian
e80d901d98 reindent 2007-02-23 16:53:24 -07:00
Brian
6df328e84d don't pass program ptr to fetch_vector[14]() 2007-02-23 16:48:07 -07:00
Ian Romanick
3f8c5969ff Fix GLAPIENTRYP for OS X.
Fix build problems related to incorrect define of GLAPIENTRYP on OS X.
Reported by bushing on IRC.
2007-02-23 15:15:50 -08:00
Brian
064ae479a7 Update DRI drivers for new glsl compiler.
Mostly:
- update #includes
- update STATE_* token code
2007-02-23 13:40:13 -07:00
Brian
36a0ee199d expose _mesa_load_tracked_matrices() 2007-02-23 13:38:37 -07:00
Brian
15b3bd1689 added linux-dri-debug 2007-02-23 11:58:46 -07:00
Brian
cc6a08b2a0 SWvertex no longer has texcoord field, use attrib field instead 2007-02-23 11:45:15 -07:00
Brian
fce8409cbb s/GLint/gl_state_index/, length is now 5 not 6 2007-02-23 11:44:44 -07:00
Brian
9fe3e2efc3 s/GLint/gl_state_index/, length is now 5 not 6 2007-02-23 11:44:14 -07:00
Brian
0020d1022f re-expose _mesa_print_alu_instruction() 2007-02-23 11:43:44 -07:00
Brian
ef0cc9db54 remove dead code 2007-02-23 11:43:14 -07:00
Brian
aa9d22a1c0 replace GLint with gl_state_index 2007-02-23 11:21:03 -07:00
Brian
99902198de comments, clean-up 2007-02-23 10:19:55 -07:00
Brian
5186ae9bbe remove unused slang_atom_pool_gen() 2007-02-23 10:12:38 -07:00
Brian
308be21c2f added slang_label.c 2007-02-23 10:04:18 -07:00
Brian
c2a261f493 comments, clean-up 2007-02-23 09:55:21 -07:00
Brian
75d4ed968d Replace slang_ir_node::Target w/ Field. Remove Comment field. Clean-up. 2007-02-23 09:42:11 -07:00
Brian
c18c75b0b7 remove old _slang_gen_if() 2007-02-23 09:38:46 -07:00
Brian
afbf7c7e6b Re-implement branching with slang_labels.
This eliminates the NOP instructions that had been used as placeholders for
branch targets.
Also, fix "return" statement bug.
2007-02-23 09:38:17 -07:00
Brian
d8d07b2a8a label routines for implementing branches, jumps 2007-02-23 09:36:29 -07:00
Brian
0cc9419631 debug code for emitting variable allocation comments 2007-02-22 17:46:20 -07:00
Brian
059376c855 expose _mesa_swizzle_string() 2007-02-22 17:45:32 -07:00
Roland Scheidegger
5e66843733 r200 fix broken (by new input handling) fogcoord 2007-02-23 01:45:19 +01:00
Brian
ff0cc92757 glslcompiler build instructions 2007-02-22 16:29:48 -07:00
Brian
bc18ac45a3 updated for vbo 2007-02-22 16:29:25 -07:00
Brian
da46353056 Remove obsolete files. 2007-02-22 16:14:02 -07:00
Brian
13e3b21b16 New, unified interpretor/executor for vertex and fragment programs.
This replaces the code formerly in nvvertexec.c and s_fragprog.c.
Currently, DDX, DDY don't work.
2007-02-22 16:09:40 -07:00
Brian
7aaefcbe48 use _mesa_get_program_register() 2007-02-22 16:08:30 -07:00
Brian
f6803de739 Use the new unified vertex/fragment program interpreter from prog_execute.c.
Currently, DDX, DDY don't work.
2007-02-22 16:08:01 -07:00
Brian
e382efc85d use new _mesa_execute_program() function 2007-02-22 16:07:17 -07:00
Brian
6cfe2114f1 FORCE_PROG_EXECUTE_C cpp flag, misc changes 2007-02-22 16:06:54 -07:00
Brian
fd89396012 fix assertion 2007-02-22 16:02:18 -07:00
Brian
7c86e10193 emit high-level IF/ELSE/ENDIF for vertex progs now 2007-02-22 16:02:08 -07:00
Brian
740a8b0b66 _mesa_ExecuteProgramNV is now a no-op 2007-02-22 16:00:54 -07:00
Brian
ef64cda978 remove nvvertexec.c, add prog_execute.c 2007-02-22 16:00:31 -07:00
Brian
3ed1acd13c use MAX_PROGRAM_ENV_PARAMS 2007-02-22 14:57:40 -07:00
Brian
b7aeac0de1 added MAX_PROGRAM_ENV_PARAMS 2007-02-22 14:57:19 -07:00
Brian
79fb4527ca added CallStack, StackDepth 2007-02-22 14:56:43 -07:00
Brian
29925c6dcd remove unneeded #includes, misc clean-up 2007-02-22 14:56:22 -07:00
Brian
e47c60443f reorg/clean-up/indent 2007-02-22 14:55:35 -07:00
Brian
11b9ef9454 start implementing conditions, branching 2007-02-22 14:43:41 -07:00
Brian
2eeaae6cbc get rid of some unused slang_variable fields 2007-02-22 11:00:10 -07:00
Brian
50040573d7 Replace slang_allocate_storage() with simpler _slang_attach_storage() 2007-02-22 10:56:41 -07:00
Brian
b618ac8c0b updated debug code 2007-02-22 09:39:25 -07:00
Brian
776bc9cf55 Undo some STATE_POINT/FOG changes. Max length of state token array is now 5. 2007-02-22 09:29:46 -07:00
Michel Dänzer
641c966e3d i915tex: Schedule flips when possible.
Also move vsync related state from context to window, so it's possible to
schedule several flips ahead of time with triple buffering.
2007-02-22 17:24:09 +01:00
Brian
3f4826a358 XXX comments about shaders 2007-02-22 09:10:38 -07:00
Brian
6ec7484ae8 use ctx->VertexProgram._Current instead of ctx->VertexProgram._Enabled 2007-02-22 09:10:24 -07:00
Brian
96abc6bf72 merge fix: add STATE_FOG_PARAMS_OPTIMIZED, STATE_SPOT_DIR_NORMALIZED 2007-02-22 09:08:53 -07:00
Brian
7b30053b26 fix negative indentation problem 2007-02-22 09:08:36 -07:00
Brian
53bcdedc32 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-22 08:57:36 -07:00
Brian
29c471aafc Merge branch 'origin' into glsl-compiler-1
Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c
2007-02-22 08:53:33 -07:00
Dave Airlie
4a1d7d6641 r300: get rid of CB_DPATH legacy 2007-02-22 19:33:50 +11:00
Brian
6d4cf6be4e updated info about arrays, predefined uniforms 2007-02-21 16:07:03 -07:00
Brian
5a2c1ad625 disable debug 2007-02-21 16:05:56 -07:00
Brian
917a5086b3 Use gl_LightSource[0].position intead of a light position uniform. 2007-02-21 15:57:55 -07:00
Brian
5d89b027ee remove unneeded #includes 2007-02-21 15:42:50 -07:00
Brian
502c132738 fix copy&paste errors 2007-02-21 15:42:10 -07:00
Brian
f958aabdf3 more minor changes to STATE_ indexing 2007-02-21 15:23:11 -07:00
Brian
78399d23dc remove dead code 2007-02-21 15:22:17 -07:00
Brian
f941892829 Reimplement the _slang_alloc_statevar() function.
After several tries at making a table-based system for examining pre-defined
uniforms to find statevar indexes, give up and do it the simple way (lots of
strcmp() calls).  Not terribly elegant, but perfectly functional.
2007-02-21 15:21:58 -07:00
Brian
6531952b3c adjustments to STATE_ token layout/format so token[1] is always the array index 2007-02-21 11:08:21 -07:00
Brian
c3301d038d checkpoint overhaul of pre-defined uniform code 2007-02-21 09:15:39 -07:00
Brian
aa7ddbd0ff clean-up, move IR_ELEMENT code 2007-02-20 17:00:16 -07:00
Brian
760c114b24 alloc IR_FIELD's Storage in codegen, like IR_ELEMENT 2007-02-20 16:56:49 -07:00
Ian Romanick
a4b344baa2 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa 2007-02-20 15:19:23 -08:00
Ian Romanick
f0bcee5db0 Delete two invalid assertions.
These two assertions are invalid for a couple reasons.  Primarily,
when this code is compiled into the X-server, the symbols
"glSecondaryColor3fEXT" and "glPointParameterivNV" do not exist.
2007-02-20 15:18:53 -08:00
Brian
10f42ddb9e work on struct/array handling 2007-02-20 15:22:38 -07:00
Brian
361b60678e forgot to return length in parse_array_len() 2007-02-20 15:20:46 -07:00
Patrice Mandin
440759c2cd nouveau: nv10: grr, ctx->DrawBuffer invalid? 2007-02-20 23:17:09 +01:00
Patrice Mandin
79870d100f nouveau: nv10: also check ctx->DrawBuffer in nv10ViewportScale 2007-02-20 23:13:48 +01:00
Patrice Mandin
102ad2e066 nouveau: nv10: keep 24/8 depth/stencil value, don't check for depth bits 2007-02-20 23:04:21 +01:00
Brian
243c2dd746 implement support for pre-defined uniform structs (state vars) 2007-02-20 14:03:43 -07:00
Brian
48d65aabbc added slang_builtin.c 2007-02-20 14:03:10 -07:00
Michel Dänzer
e33a9d6894 i915tex: Triple buffering support, only effective with page flipping so far.
Pending flips are tracked per renderbuffer and the colour renderbuffer
attachments of window framebuffer objects are rotated on flips to avoid
stalling the pipeline for pending flips unnecessarily.
2007-02-20 19:15:44 +01:00
Michel Dänzer
356bf9563e intelWindowMoved: Some debugging output was accidentally left always enabled. 2007-02-20 19:15:44 +01:00
Michel Dänzer
bfbc1de02e intelRotateWindow: Only use back buffer and cliprects in very specific cases. 2007-02-20 19:15:44 +01:00
Michel Dänzer
6f2bf34748 intelCopyBuffer: Remove incorrect intel_fb->pf_current_page tests.
intel_get_rb_region already takes the current page into account.

This would result in broken rendering when multiple 3D windows are visible
and the pages are reversed.
2007-02-20 19:15:44 +01:00
Michel Dänzer
6b99cafd69 i915tex: Support page flipping on both CRTCs independently.
No longer track page flipping state per context but per window, via struct
intel_framebuffer which wraps struct gl_framebuffer for windows.
2007-02-20 19:15:44 +01:00
Michel Dänzer
af64dd2ae0 i915tex: Make page flipping work again. 2007-02-20 19:15:44 +01:00
Adam Jackson
d44027dbbd Fix parallel make in r300 driver. 2007-02-20 12:48:50 -05:00
Brian
bd894c4705 added SWIZZLE_XXXX, SWIZZLE_YYYY, etc 2007-02-20 10:40:08 -07:00
Brian
18e9ca5fb0 more branch info 2007-02-20 09:24:06 -07:00
Brian
906fd23e1d glxext.h version 18 2007-02-20 08:41:15 -07:00
Brian
45b1f169b4 updated to version 18 2007-02-20 08:40:55 -07:00
Brian
d2ffe4ca07 glext.h version 39 2007-02-20 08:38:46 -07:00
Brian
c226e44437 updated to version 39 2007-02-20 08:38:29 -07:00
Christian Neumair
20e851bb9a set log level w/ env var 2007-02-20 08:11:11 -07:00
Brian
174c555414 remove accidental check-in 2007-02-20 08:05:29 -07:00
Brian
3d001b81c2 Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1 2007-02-20 08:04:40 -07:00
Thomas Hellstrom
d2b06403c6 i915tex: Fix performance regression with new vbo code and latest drm.
With current memory preferences, vbos ended up in AGP space
where reading from them got a bit slow.

Make sure buffer objects are initially created in system memory.
2007-02-19 19:57:30 +01:00
Brian
9449a4d894 s/PROG_PRINT_ARB/PROG_PRINT_DEBUG/ 2007-02-17 09:41:59 -07:00
Brian
61d31ae10d info about stand-alone compiler 2007-02-17 09:41:19 -07:00
Brian
cc153541a2 stand-alone GLSL compiler 2007-02-17 09:15:39 -07:00
Brian
501ee87180 Lots of changes to prog_print.c code.
Mainly, allow printing programs in either ARB, NV or "debug" formats.
2007-02-17 09:15:00 -07:00
Sean D'Epagnier
43c6b2f67f Merge branch 'master' of git+ssh://geckosenator@git.freedesktop.org/git/mesa/mesa 2007-02-16 17:46:11 -07:00
Sean D'Epagnier
7ae8f388cf Commiting a few minor fixes to glut fbdev (segfault on a separate stack)
Updated all drivers that used the old _ac_ functions to use
the new _vbo_  functions. I know this fixed the fbdev driver,
it looks like it might fix some other drivers too.
2007-02-16 17:44:13 -07:00
Jerome Glisse
515f495f4e doxygen: update doxygen project number to 6.5
doxygen number was laggin behind a bit.
2007-02-16 23:22:04 +01:00
Jerome Glisse
c2e0570831 Update doxygen doc to reflet vbo changes.
Update doxygen doc, array_cache no longuer exist,
new shiny vbo modules is there. Tested on unix,
but i think i didn't broke that bat :).
2007-02-16 23:19:05 +01:00
Patrice Mandin
21f2f7f26b nouveau: nv50: update 2007-02-16 22:39:28 +01:00
Patrice Mandin
4cc4a753fa nouveau: nv10,20: wrong viewport clip setup 2007-02-16 22:39:12 +01:00
Patrice Mandin
0fccb646e0 nouveau: nv20: texture matrix 2007-02-16 22:09:42 +01:00
Patrice Mandin
66d8e55184 nouveau: nv20: update 2007-02-16 22:03:31 +01:00
Patrice Mandin
f942dc5522 nouveau: nv10: set clear value for 16 and 24 bits depth 2007-02-16 20:26:57 +01:00
Patrice Mandin
9131536f00 nouveau: nv10: rescale depth near and far 2007-02-16 19:54:55 +01:00
Patrice Mandin
252d1de054 nouveau: nv10: fix viewport scale and origin 2007-02-16 19:46:54 +01:00
Brian
00647c39de remove dead code 2007-02-16 09:59:27 -07:00
Brian
c177191804 s/_slang_link2/_slang_link/ 2007-02-16 09:56:19 -07:00
Brian
1c1a0a23d3 change all enum tokens to uppercase 2007-02-16 09:31:35 -07:00
Brian
d15059b128 abort upon errors (temporary) 2007-02-16 09:06:09 -07:00
Brian
d30806b0c5 added a comment 2007-02-16 09:05:11 -07:00
Brian
9ea2315d2d Allow int->float argument conversion in _slang_locate_function(). 2007-02-16 09:04:53 -07:00
Brian
d003877c66 implement IR_I_TO_F 2007-02-16 08:58:42 -07:00
Rune Peterson
e4c772bead r300: Fix cos & add scs to fragment program.
So this do :
 - Fixes COS.
 - Does range reductions for SIN & COS.
 - Adds SCS.
 - removes the optimized version of SIN & COS.
 - tweaked weight (should help on precision).
 - fixed a copy paste typo in emit_arith().
2007-02-14 23:10:52 +01:00
Etienne Clement
1e2b469635 test for POT before using sample_2d_linear_repeat() 2007-02-14 13:21:12 -07:00
Roland Scheidegger
7d8ed0f5f5 fix typo preventing generic arrays from working with ARB_vp (bug #9952) 2007-02-14 20:36:29 +01:00
Patrice Mandin
83cf4ce6e4 nouveau: nv10: there are 8 clipping regions 2007-02-14 20:28:31 +01:00
Roland Scheidegger
99dfca1e7f fix stupid bug in the optimized per-vertex fog generation code 2007-02-14 16:38:32 +01:00
Thomas Hellstrom
bc82b44db9 i915tex: Take into account various mapping states when dropping the
batch buffer after a resolution / rotation switch.
2007-02-14 11:11:37 +01:00
Brian
ed490e4643 remove dead code 2007-02-13 09:23:00 -07:00
Xiang, Haihao
1e6688742e I965: fix a failure on waiting irq.
Wait until getting the right fence if drm/i915 resets the
counter.
2007-02-12 16:38:50 +08:00
Zou Nan hai
ebcc9b5d12 fd.o #BZ 9684
gcc may cast an overflowed float value to an negative int value on i386,
  fix it to make sure at least some apps will not crash if it contains wrong normal data.
2007-02-12 12:16:49 +08:00
Rune Peterson
ee5417bca8 r300: Add proper support for sin/cos instruction in fragment program
Getting proper SIN and COS wasn't as easy as it appeared.
I had to make make some changes to the fragment program code.
general FP changes:
- support HHH swizzle for vector instructions.
- don't copy a source to a temp when it is not XYZW swizzled, but
 combine the two and have the swizzle resolve any issues.
 (saves temps/instructions with more elaborate shader code)
- fix overflow in cnstv[].
2007-02-12 00:24:36 +01:00
Rune Peterson
3bacb68c70 ctx->Point._Size fix 2007-02-10 18:19:43 -07:00
Brian
5620392d67 add prog_debug.c 2007-02-09 15:40:15 -07:00
Brian
942ee02590 move GL_MESA_program_debug funcs to prog_debug.c 2007-02-09 15:40:00 -07:00
Brian
383ecc0374 Move experimental GL_MESA_program_debug functions into new file. 2007-02-09 15:39:32 -07:00
Brian
b3893baf80 comments, etc 2007-02-09 14:19:12 -07:00
Brian
3d479b9638 re-enable free'ing of IR trees 2007-02-09 14:18:41 -07:00
Brian
cf490a7f81 always init param vars to silence valgrind warnings 2007-02-09 12:04:52 -07:00
Roland Scheidegger
b2d30ca0cb optimize per-pixel fog program
use the same internal state as for vertex fog. From the old implemenentation,
this changes a SUB+MUL into a MAD for linear fog, and saves a MUL for EXP/EXP2,
plus saves a (constant) parameter. While here, fix the broken (forgotten)
swizzling. (untested)
2007-02-09 19:21:29 +01:00
Zou Nan hai
fcccf89432 array overflow fix 2007-02-09 13:28:56 +08:00
Brian
5e6908944b do full swizzled matching in _mesa_lookup_parameter_constant() 2007-02-08 20:39:42 -07:00
Brian
bd9615bbc5 Check for constant-valued while/do loop conditions.
Allows us to:
1. avoid generating constant-valued BRK test for while(1)..
2. discard entire loop for while(0).
3. detection infinite loops at compile-time.
2007-02-08 17:40:29 -07:00
Brian
c0a9f554be optimize conditional breaks/continues 2007-02-08 17:11:18 -07:00
Roland Scheidegger
421ce180f5 r200: simplify / unify input map handling for vp and fftnl
Use the same input map handling for fftnl and vertex programs. It doesn't
enable any new functionality (should make it easy to support per-vertex
materials though), but the code is much cleaner.
2007-02-09 00:36:53 +01:00
Roland Scheidegger
54dac2c843 optimize generated vertex programs a bit
Use new internal state to avoid per-vertex normalization of static spot
direction vector. Use internal state for simpler per-vertex fog computations
(MAD instead of SUB/MUL for linear fog, EX2 instead of POW for EXP/EXP2 fog).
Simplify point size calc (2 MADs instead of MOV, MUL, MUL, DP3), and while
there fix it up (RSQ instead of RCP). All untested...
2007-02-09 00:36:40 +01:00
Roland Scheidegger
6cf892eeb6 fix issues in vp when using FRAG_BIT_WPOS in a fragment program (bug #9910)
Redirect all VERT_RESULT_HPOS writes to a temp and use that for fixup.
The viewport transformation still seems to take some shortcuts, and it
still does not seem to work at all...
2007-02-09 00:25:53 +01:00
Brian
6230ae7faf cont at top of loop, little clean-ups 2007-02-08 15:09:47 -07:00
Brian
a1c2e87c4b remove some cruft 2007-02-08 15:08:16 -07:00
Brian
fbf0f400b7 fix broken BRA for return stmts 2007-02-08 14:10:54 -07:00
Brian
34af2b7194 consolidate BRA with BRK, CONT 2007-02-08 14:10:19 -07:00
Brian
c81aedeaec change BranchTarget to GLint 2007-02-08 14:09:34 -07:00
Brian
b768c48547 Use conditional break in for/do/while loops. 2007-02-08 13:23:17 -07:00
Brian
97125fb370 Simplify code with eval_condition(). Implement conditional BRK. 2007-02-08 13:22:31 -07:00
Brian
2c75ef62ea remove old loop break/cont stuff 2007-02-07 16:19:19 -07:00
Brian
b35b4566c2 high vs. low level if/then/else code emit 2007-02-07 16:11:00 -07:00
Brian
c5e6bf63e6 s/%f/%g/ 2007-02-07 16:09:13 -07:00
Brian
a7c2c7d6b2 Remove old functions for generating BRA-based looping. 2007-02-07 15:14:20 -07:00
Brian
4aa487e796 Use IR_LOOP to represent do-while and for-loops.
Also, start moving high vs. low-level instruction selection into slang_emit.c
2007-02-07 15:12:13 -07:00
Brian
1f99a7514e BRK and CONT work the same 2007-02-06 22:34:09 -07:00
Brian
f22ed0986a Implement CONT, improve BRK.
IR_LOOP's BranchNode ptr is the head of a linked list of CONT and BRK nodes.
After emitting loop, walk over the linked list, filling in the CONT/BRK
instruction's BranchTarget field (location of the ENDLOOP instruction, or
one past).
2007-02-06 22:31:19 -07:00
Brian
5f7d4668c4 replace IR_BEGIN_LOOP/IR_END_LOOP with IR_LOOP 2007-02-06 21:33:29 -07:00
Brian
7e73bc32f5 new_node[0123]() functions 2007-02-06 20:53:09 -07:00
Brian
2043364516 redo IR_IF node, removing IR_ELSE, IR_ENDIF 2007-02-06 20:45:43 -07:00
Ben Skeggs
f46c19d965 nouveau: a couple of NV3x fixes 2007-02-06 14:01:19 +11:00
Brian
d434019633 additional comments for BranchTarget 2007-02-05 18:04:35 -07:00
Brian
2755c798f3 BRK instruction's BranchTarget field now used for efficiently breaking out of loops.
BRK's BranchTarget field actually points to the top of the loop, not the
bottom, since we don't know the later's location yet.  In the interpreter,
basically do an indirect jump to update the PC.
2007-02-05 18:01:02 -07:00
Brian
8608079647 Use IR node's BranchNode field for IF/ELSE/ENDIF instructions.
This allows us to back-patch the IF/ELSE instruction's BranchTarget field
to point to the location of the ELSE/ENDIF instructions.  No longer have to
search for ELSE/ENDIF in the interpreter.  Also makes it trivial to translate
IF/ELSE instructions into conditional/unconditional BRA instructions.
2007-02-05 17:18:10 -07:00
Jakob Bornecrantz
8518ddda7b Add support for CN700 chipset in miniglx 2007-02-06 10:22:47 +11:00
Brian
d9731b26e7 minor formatting changes 2007-02-05 15:17:06 -07:00
Brian
5e73284cee set UseHighLevelInstructions = false for now 2007-02-05 15:00:48 -07:00
Brian
cf92c72797 Initial implementation of high-level flow-control instructions.
IF/ELSE/ENDIF and BEGIN_LOOP/END_LOOP/BREAK instructions seem to work.
Disabled by default though until better tested.
Implemented IR_NOT, but needs optimization.
2007-02-05 15:00:07 -07:00
Brian
5db088d70f indentation for program instructions (if/else, loops) 2007-02-05 14:58:15 -07:00
Roland Scheidegger
17c13b406f fix issues when using mixed-mode pos-invariant vp and ff tnl (bug #9856)
ARB_vp requires vertex transformation to be invariant to fixed function tnl
if the position_invariant option is used. So the same function needs to be
used, otherwise z-fighting artifacts may happen with applications which rely
on the results being really the same due to precision issues when dealing with
floating point values (may not be a problem when using a non-optimizing
compiler strictly following IEEE rules).
2007-02-05 21:29:25 +01:00
Brian
01001d80e2 Initial support of loop and subroutine instructions.
New high-level flow-control instructions, both at IR level and GPU instructions
for looping and subroutines.
2007-02-05 11:28:15 -07:00
Brian
5b8a50572d Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-05 10:29:58 -07:00
Panagiotis Papadakos
d0b5c77c68 fix mem leak 2007-02-05 10:29:10 -07:00
Brian
dd34fe8679 Merge SWvertex texcoord and varying fields into attrib[] array field.
Fragment texcoords and varying code is now unified in the point/line/triangle
rasterization code.  In the future, merge color, fog, etc. attribs.
2007-02-05 10:10:01 -07:00
Ben Skeggs
4b3679c6c5 nouveau: OUT_RINGp expects the size in dwords, not bytes.
This fixes the *actual* bug that the previous commit was supposed to fix..
2007-02-06 02:29:20 +11:00
Panagiotis Papadakos
eab92fcdc2 fix mem leaks 2007-02-05 08:17:50 -07:00
Ben Skeggs
47bd759fc9 nouveau: fix a small bug in nv10 swtcl 2007-02-06 01:57:04 +11:00
Ben Skeggs
e7654b22aa nouveau: new bufferobj code.
The old code suffered from a number of issues, the most severe being that
with the Mesa VBO merge even swtcl used the driver's bufferobj interface.
On most VBO types (or non-AGP cards) the buffer ended up in vram, and
killed swtcl performance greatly.  All bufferobj's start in system memory
now, until they get referenced as a "real" VBO.

The other big change is that only potentially "damaged" areas are
uploaded/downloaded to/from the hardware.
2007-02-06 00:39:50 +11:00
Panagiotis Papadakos
3805ccf020 break if we removed driver from Drivers list in driDestroyDisplay
Else we read memory we just released, in for statement.
2007-02-05 10:35:52 +01:00
Patrice Mandin
296eeb882f nouveau: nv10: add init for unknown 0x120 2007-02-04 13:10:23 +01:00
Stephane Marchesin
6356874586 nouveau: fix nv04 and nv10 swtcl, more work on nv04 state. 2007-02-04 03:20:01 +01:00
Brian
93b975a1d9 Add literal_size field to slang_operation.
Used to track the number of components in a float/int/bool literal.
Helps with some typechecking things.
Fixes problems with calls such as "distance(v2, vec2(1.0, 2.0))"
2007-02-03 17:24:24 -07:00
Brian
5ee684cba9 minor tweaks to distance() funcs 2007-02-03 17:21:33 -07:00
Brian
82f53f45d9 remove unused slang_operation fields 2007-02-03 16:25:44 -07:00
Patrice Mandin
f8ec7f1398 nouveau: forgot function declaration 2007-02-03 23:46:58 +01:00
Patrice Mandin
be85770f14 nouveau: nv50: use nv50 state 2007-02-03 23:32:12 +01:00
Brian
edf24e699e shading language texture demo/test 2007-02-03 11:36:16 -07:00
Brian
00d63aafc6 added FLUSH_VERTICES() in _mesa_use_program() 2007-02-03 11:35:02 -07:00
Brian
8e0c6fc0be added texdemo1 2007-02-03 11:33:13 -07:00
Brian
68fc4ff1d7 Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS.
This fixes a segfault in the texgen code that can occur after we've
disabled a vertex program.
2007-02-03 10:31:16 -07:00
Brian
49a17a45fb Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS.
This fixes a segfault in the texgen code that can occur after we've
disabled a vertex program.
2007-02-03 10:30:50 -07:00
Michel Dänzer
5aa997dafb Merge branch 'origin' 2007-02-03 17:37:01 +01:00
Michel Dänzer
cf4ccd5020 Fall back to software rasterization if r300_translate_fragment_shader() fails.
Aborting immediately is a bad idea with AIGLX.
2007-02-03 17:32:02 +01:00
Michel Dänzer
beffa17bb9 Remove unused r200 files from r300 driver directory. 2007-02-03 17:24:22 +01:00
Michel Dänzer
0afc2d37c3 r300CreateContext: Really initialize r300->initialMaxAnisotropy. 2007-02-03 17:23:19 +01:00
Patrice Mandin
de24b01b05 nouveau: fix viewport clipping initialization 2007-02-03 13:22:42 +01:00
Patrice Mandin
1c25561e30 nouveau: use color pitch as depth pitch if depth disabled 2007-02-03 13:20:16 +01:00
Roland Scheidegger
2a441c488f disable r200 materials-between-begin-end check if vertex progs are enabled 2007-02-03 03:31:31 +01:00
Roland Scheidegger
f697308ae5 remove now unused vtxfmt stuff from radeon/r200 header files 2007-02-03 03:15:45 +01:00
Roland Scheidegger
09e4df2c65 fix errorneously adding fog state params to all vertex programs... 2007-02-03 03:15:14 +01:00
Brian
fee9bbe475 Only glUniform1i() can be used to set sampler uniforms. Generate error otherwise. 2007-02-02 18:05:43 -07:00
Brian
a90e4c3ddf add vec4_texcube to AsmInfo[] 2007-02-02 18:00:26 -07:00
Brian
1b3092e4bb add _slang_multiply_swizzles() 2007-02-02 18:00:03 -07:00
Brian
bf823b6b77 clean-ups 2007-02-02 16:46:50 -07:00
Brian
670e900719 clean-ups 2007-02-02 16:45:07 -07:00
Brian
31d2a00192 clean-ups 2007-02-02 16:41:52 -07:00
Brian
b4f38a4d60 remove slang_builtin_vec4.gc 2007-02-02 16:38:04 -07:00
Brian
4bbef7a644 remove slang_builtin_vec4.gc 2007-02-02 16:38:00 -07:00
Brian
d9dbb3e154 remove slang_export.[ch] 2007-02-02 16:14:55 -07:00
Brian
e1b47b68ec reformat, clean-up comments 2007-02-02 16:12:20 -07:00
Brian
1f9def3163 move _slang_locate_function() 2007-02-02 16:10:02 -07:00
Brian
9cfee527f6 remove multibyte chars 2007-02-02 16:08:45 -07:00
Brian
3f71282850 remove unused field 2007-02-02 15:33:16 -07:00
Brian
72c3672857 remove slang_asm_string() 2007-02-02 15:32:32 -07:00
Brian
0d1cd6d41c s/SLANG_ASSEMBLE_TYPEINFO_H/SLANG_TYPEINFO_H/ 2007-02-02 15:31:21 -07:00
Brian
1bc71e32ea s/slang_assembly_typeinfo/slang_typeinfo/ 2007-02-02 15:30:50 -07:00
Brian
fe45343df9 s/slang_assembly_name_space/slang_name_space/ 2007-02-02 15:29:48 -07:00
Brian
884fdfeb22 remove slang_library_texsample.[ch] 2007-02-02 15:23:38 -07:00
Brian
4a2ef4fd88 remove slang_library_texsample.[ch] 2007-02-02 15:23:33 -07:00
Brian
6c52dd3852 rename slang_link2.c slang_link.c 2007-02-02 15:22:05 -07:00
Brian
5c1763e7b5 rename slang_link2.c slang_link.c 2007-02-02 15:22:02 -07:00
Brian
f65091c947 rename slang_assemble_typeinfo.[ch] to slang_typeinfo.[ch] 2007-02-02 15:19:58 -07:00
Brian
7ace638da2 rename slang_assemble_typeinfo.[ch] to slang_typeinfo.[ch] 2007-02-02 15:19:48 -07:00
Brian
4f22bdf3e5 remove more slang assembly-related code 2007-02-02 15:17:46 -07:00
Brian
640afdf4f2 remove more slang assembly-related files, codee 2007-02-02 15:16:51 -07:00
Brian
452217e29a removed obsolete shader assembly files 2007-02-02 15:10:34 -07:00
Brian
11e92390f6 remove more assembly-related code 2007-02-02 15:05:46 -07:00
Brian
b94c14114f remove slang_assemble*.c files 2007-02-02 14:51:34 -07:00
Brian
8d39610037 move some functions, disable some code in preparation for removing assembly code 2007-02-02 14:51:09 -07:00
Brian
fa1fe5f6f3 fix emit_tex() breakage 2007-02-02 14:47:03 -07:00
Brian
1b24e2d5a7 remove slang_export.c and related code 2007-02-02 14:24:24 -07:00
Brian
5072fd3a64 Remove old slang linker code. 2007-02-02 14:05:55 -07:00
Brian
8b60787e85 remove slang_link.c and slang_analyse.c 2007-02-02 14:05:25 -07:00
Brian
d79fd74871 remove old linker stuff 2007-02-02 14:04:58 -07:00
Brian
a4f4ca7767 added newline at end 2007-02-02 13:54:24 -07:00
Brian
ccd3e7dcef Remove obsolete files. 2007-02-02 13:53:28 -07:00
Brian
650d46a107 remove slang_execute.c, slang_execute_x86.c 2007-02-02 13:49:39 -07:00
Brian
d265bdf81a Remove all dependencies on the old slang interpreter/executor. 2007-02-02 13:49:07 -07:00
Brian
aa6866d63c reindent 2007-02-02 12:08:26 -07:00
Brian
b12b13f832 _slang_evaluate_int() no longer used 2007-02-02 12:07:57 -07:00
Brian
06daf74a71 use _slang_simplify() to evaluate array sizes 2007-02-02 12:02:53 -07:00
Brian
70570d4199 Move guts of slang_lookup_constant() into a new function in slang_simplify.c 2007-02-02 12:01:29 -07:00
Brian
5c21747783 replace abort() with _mesa_problem() 2007-02-02 11:42:04 -07:00
Brian
2f5b3c9607 fix maxInst argument 2007-02-02 11:37:58 -07:00
Brian
e53ec3a862 try to simplify variable initializers 2007-02-02 11:32:59 -07:00
Brian
6147ccba63 unroll inner loop of interpolate_varying() 2007-02-02 11:23:16 -07:00
Brian
531348e814 simplify derivative-related code 2007-02-02 11:20:08 -07:00
Brian
e4f976b8b9 simplify interpolate_texcoords() 2007-02-02 11:19:43 -07:00
Brian
9ab512ad8c Replace color, z, w, texture interpolants with new generic attrib interpolants. 2007-02-02 11:01:01 -07:00
Brian
462d8f5faf New span attrStart/attrStepX/attrStepY fields to replace fog, specular, etc. fields. More to come. 2007-02-02 09:46:43 -07:00
Brian
4e7fd7ad96 get rid of unused span->start field 2007-02-02 09:09:13 -07:00
Keith Whitwell
b59657ad96 Merge branch 'vbo-0.2'
Conflicts:

	src/mesa/main/texcompress_s3tc.c
	src/mesa/tnl/t_array_api.c
2007-02-02 12:26:10 +00:00
Keith Whitwell
2ddc8799a8 Merge branch 'vbo-0.2-origin' into vbo-0.2 2007-02-02 11:06:37 +00:00
Keith Whitwell
47d463e954 Modify assert to reflect rebase criteria 2007-02-02 10:59:58 +00:00
Zou Nan hai
325196f548 push commit 2dfb3a217f to i915tex 2007-02-02 14:37:24 +08:00
Zou Nan hai
2dfb3a217f Fix fd.o #9686, when fall into vertex fog,
fog factors are precomputed in t_vb_fog.c compute_fog_blend_factors,
  which is incompatible with appended fragment fog code.
  That will make GoogleEarth display abnormally.
  always use pixel fog.
2007-02-02 09:35:17 +08:00
Brian
9742547245 Fix logic in _slang_simplify(): vec2() constructor case wasn't getting used. 2007-02-01 18:11:19 -07:00
Roland Scheidegger
8ebda479d9 fix missing ADD_POINTERS, fixes crashes if the index elements are in a vbo. 2007-02-01 20:59:45 +01:00
Brian
abeca8d17d comments 2007-02-01 10:08:07 -07:00
Brian
496aa47042 remove slang_label.c until it's ready 2007-02-01 09:52:26 -07:00
Brian
f3e507ef9f New SWspanarrays attribs[] array.
Replace texcoord[], varying[], etc. arrays with single attribs[] array, indexed
by FRAG_ATTRIB_* values.
Eliminates need to copy data into fragment program machine input registers.
Will lead to future clean-ups.
2007-02-01 09:51:48 -07:00
Brian
81ef03be65 silence uninitialized var warning 2007-02-01 09:25:55 -07:00
Brian
8fa6f7363e silence uninitialized var warning 2007-02-01 09:24:41 -07:00
Brian
3866558c98 move span-related types/tokens into s_span.h 2007-02-01 08:24:02 -07:00
Brian
f673b24017 additional assertions, bump up MAX_EXEC 2007-02-01 08:18:03 -07:00
Brian
af1d1e08e4 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-02-01 07:22:50 -07:00
Brian
0930248bb1 fix mem leak in __glXReportDamage (Panagiotis Papadakos) 2007-02-01 07:22:25 -07:00
Keith Whitwell
5368ae5ec3 Correct usage/meaning of max_index parameter. 2007-02-01 14:21:14 +00:00
Keith Whitwell
605d428d20 Cope with internally-generated null inputs. 2007-02-01 14:20:31 +00:00
Michel Dänzer
8628b382e4 driDestroyDisplay: Fix comment, it is called now. 2007-02-01 10:45:51 +01:00
Michel Dänzer
bed026e7dd driDestroyDisplay: Remove Drivers list entry when dlclosing its handle.
This fixes a regression from commit f81b1dbe37:
Since then, driDestroyDisplay gets called from __glXFreeDisplayPrivate. It
dlcloses the handles associated with the display but fails to remove their
references from the Drivers list, so subsequent calls to OpenDriver return a
stale handle and an invalid createNewScreenFunc pointer. The attempt to call
the latter results in a segfault when running amoeba, e.g.
2007-02-01 10:43:10 +01:00
Roland Scheidegger
a2104dc6e1 fix unitialized values in radeonClear 2007-02-01 01:09:26 +01:00
Brian
d9d33b6fc8 disable all x86 code, broken and will eventually be removed 2007-01-31 17:01:52 -07:00
Brian
b63c100677 Overhaul handling of writemasks/swizzling. This fixes two problem cases:
vec2 v;  v.x = v.y = 1.0;  // chained assignment
vec4 v;  v.zx = vec2(a,b);  // swizzled writemask
2007-01-31 16:34:54 -07:00
Brian
309d5b6650 New asm instruction and IR_CLAMP node type to allow clamping to [0,1] with instruction saturate-write option. Not finished yet. 2007-01-31 08:55:10 -07:00
Brian
9d5853813f allow fragment-only and vertex-only programs 2007-01-31 08:47:12 -07:00
Xiang, Haihao
5893474c74 _mesa_pack_rgba_span_float: fix for packing data into group 2007-01-31 09:47:02 +08:00
Brian
7162398778 fix _mesa_get_uniform_location() so it uses the given program handle 2007-01-30 16:55:03 -07:00
Keith Whitwell
893526b8a8 Use new rebase helper. Remove other rebase code. 2007-01-30 20:22:55 +00:00
Keith Whitwell
240641de0c Helper for rebasing draw requests where min_index != 0. 2007-01-30 19:27:53 +00:00
Keith Whitwell
48c638b671 New tests for the array functions which also provoke rebasing. 2007-01-30 19:19:51 +00:00
Brian
876e372567 regenerated 2007-01-30 08:13:49 -07:00
Brian
d2c62e6065 s/params/pointer/ for glGetVertexAttribPointer 2007-01-30 08:13:02 -07:00
Brian
8811a9e38a bump version to 6.5.3 2007-01-30 08:11:50 -07:00
Brian
fea6a8e1f1 s/params/pointer/ for glGetVertexAttribPointer 2007-01-30 08:10:03 -07:00
Brian
8be177a694 s/params/pointer/ for glGetVertexAttribPointer 2007-01-30 08:09:25 -07:00
Brian
832417f31e s/params/pointer/ for glGetVertexAttribPointer 2007-01-30 08:02:20 -07:00
Ben Skeggs
a4ddd64f36 nouveau: argh 2007-01-30 16:51:50 +11:00
Ben Skeggs
f9345c7c4e nouveau: misc NV40 fixes 2007-01-30 16:49:27 +11:00
Ben Skeggs
d2c4d9ff9b nouveau: NV40 glClipPlane support. 2007-01-30 16:41:55 +11:00
Ben Skeggs
ede8017d2c nouveau: rework shader param handling
Conflicts:

	src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
2007-01-30 16:41:20 +11:00
Ben Skeggs
de0cf18b09 nouveau: oops, build attrib map after we know how the final shader will look.. 2007-01-30 16:39:31 +11:00
Ben Skeggs
2d8b316109 nouveau: remove an unused table 2007-01-30 16:39:05 +11:00
Ben Skeggs
7fbf8d3324 nouveau: oops 2007-01-30 16:38:46 +11:00
Ben Skeggs
cafbc459f5 nouveau: maintain a map of which vtxprog input corresponds to which array 2007-01-30 16:38:30 +11:00
Ben Skeggs
0c5b42a991 nouveau: unhardcode some more NV30TCL_FP_CONTROL values 2007-01-30 16:03:13 +11:00
Matthieu Castet
aa397fe472 nouveau : NOUVEAU_RING_TRACE
allow to print what we are really sending to the fifo.
2007-01-29 23:26:35 +01:00
Matthieu Castet
c97540065c nouveau : nv10 comment icomplete command 2007-01-29 23:19:12 +01:00
Brian
fc5a7ea5de noise() works now 2007-01-28 19:02:03 -07:00
Brian
7aece10039 noise functions 2007-01-28 19:01:35 -07:00
Brian
f94e4f216f simple noise test 2007-01-28 19:01:04 -07:00
Brian
a06f929362 combine emit_unop(), emit_binop(), emit_triop() into emit_arith() 2007-01-28 16:26:09 -07:00
Brian
62e7c033c0 implement mix() with LRP instruction 2007-01-28 16:11:11 -07:00
Matthieu Castet
c7c0a6ddcd nouveau : nv10 mixing cached stuff with not cached stuff is bad. 2007-01-28 23:26:21 +01:00
Brian
4de6fac4da Lots of vartable clean-ups, fixes. Report an error message when we run out
of registers, rather than crash.
2007-01-28 12:49:47 -07:00
Brian
602dc1a638 minor clean-ups 2007-01-28 12:13:27 -07:00
Brian
bbec2fdb3a minor updates 2007-01-28 12:11:10 -07:00
Ben Skeggs
b0e86b2dbd nouveau: fix nv30 line width 2007-01-28 22:55:35 +11:00
Ben Skeggs
aacea52181 nouveau: initial GL_ARB_occlusion_query support
Only enabled on NV40, NV20/NV30 code is untested.. However, NV30
should be identical to NV40.
2007-01-28 17:02:40 +11:00
Ben Skeggs
1879069eab nouveau: extend notifier interface to allow multiple notifiers in a memory block. 2007-01-28 16:35:32 +11:00
Brian
513325fa32 Clean-up of var/temp allocation function parameters. 2007-01-27 20:29:33 -07:00
Brian
d6772f157a Improved register allocation: allow four 'float' vars or temporaries to share a single register. Clean-up needed. 2007-01-27 20:06:41 -07:00
Claudio Ciccani
ea55de3d65 Updated copyright header.
Switched to LGPL (GPL header was a cut-&-paste mistake).
2007-01-27 19:32:05 +01:00
Brian
04d60ea54c note that non-member posts are auto-rejected 2007-01-27 06:25:31 -07:00
George Sapountzis
c00169fd25 Bug 9628: no entry for GetVertexAttribPointerv
This is because (in glX_API.xml) GetVertexAttribPointerv is aliased to
GetVertexAttribPointervARB which is then aliased to GetVertexAttribPointervNV.

Make GetVertexAttribPointerv alias GetVertexAttribPointervNV directly. Patch
by Ian Romanick <idr@us.ibm.com> and regenerate.
2007-01-27 09:12:57 +02:00
Brian
d8df84aae1 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-01-26 19:08:58 -07:00
Brian
1b62353dd8 fix typo 2007-01-26 19:08:34 -07:00
Stephane Marchesin
0931e21eb6 nouveau: more work on nv04, this time buffer format/pitches/... 2007-01-27 03:08:01 +01:00
Brian
99c9bc386f document, re-indent _mesa_ffsll() 2007-01-26 19:01:55 -07:00
Brian
1d74e565db Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-01-26 18:55:12 -07:00
Eric Anholt
5a3d985395 Bug #9604: Fix a static buffer allocation failure.
The pool that the static buffer got allocated from was sized by pitch * height,
but the buffer generated from it had its size aligned to a tile boundary, so
allocation failed if pitch * height wasn't aligned.  However, the 2d driver
ensures that the size ends at a tile boundary, so just pass the 2d driver's
buffer size rather than calculating it.
2007-01-26 14:23:29 -08:00
Eric Anholt
869b8ad499 Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use it. 2007-01-26 14:18:24 -08:00
Eric Anholt
dbb54b234c Remove dead code causing a warning. 2007-01-26 14:18:24 -08:00
George Sapountzis
507167d7e2 Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().
This leaves one last XFree86Server ifdef in Mesa core.

---

Bug 9285: misc glcore, xmesa cleanups

ACKed by Ian Romanick.
2007-01-26 18:31:44 +02:00
George Sapountzis
c9b33ecd7c Drop old (pre-AIGLX) GLcore interface.
The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX,
it is only used by DDX's which are known not to work with the new DIX glx code.

---

Bug 9285: misc glcore, xmesa cleanups

ACKed by Ian Romanick.
2007-01-26 18:31:00 +02:00
Zou Nan hai
c6c65e7b22 Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa 2007-01-26 07:05:02 +08:00
Zou Nan hai
6aa62ba43f ARB_Occlusion_query should support multiple query at same time 2007-01-26 07:04:15 +08:00
Brian
ea8b68e0f7 asst fixes, tranpose span->varying array indexes 2007-01-25 10:54:52 -07:00
Brian
ff13f0ea4d fixes, clean-ups, transpose span->varying array indexing 2007-01-25 10:52:48 -07:00
Roland Scheidegger
38e9f8b6f2 do not rebase index buffers as it does not work currently (tested with r200 and sw mesa) 2007-01-25 18:52:40 +01:00
Brian
5ef553da9a new comments, ideas 2007-01-25 10:51:53 -07:00
Roland Scheidegger
78b64d911b allocate larger minimum dstelt buffer
increase the minimum dstelt buffer size to avoid triggering an assertion later
because the split is triggered before the buffer is full. This fixes cases
where the vbo_split_copy path is hit because of maximum index limit, where the
dstelt buffer size needed could be very small (doom3 hit that assertion with a
vertex count of just 3)
2007-01-25 16:39:02 +01:00
Roland Scheidegger
db79d7dea0 fix dstelt memory allocation to avoid hash corruption 2007-01-25 14:32:06 +01:00
Roland Scheidegger
327462d901 remove tnl/t_vtx_x86_gcc.S file from sources as it no longer exists 2007-01-25 12:12:54 +01:00
Roland Scheidegger
5970400476 re-fix bug 9062 in vbo code 2007-01-25 12:11:03 +01:00
Ben Skeggs
d5db167c2c nouveau: unbreak NOUVEAU_RING_DEBUG 2007-01-25 15:12:49 +11:00
Ben Skeggs
86996dfe32 nouveau: add result scaling to shader backend, use it in RSQ emul for NV40. 2007-01-25 13:40:51 +11:00
Ben Skeggs
2d7687865e nouveau: and here's the "oops, I suck" commit :) 2007-01-25 12:08:49 +11:00
Ben Skeggs
42bd32dad7 nouveau: some extra debug output 2007-01-25 11:56:45 +11:00
Brian
e713c21bd0 remove some parenthesis 2007-01-24 14:15:01 -07:00
Brian
ff917003f6 use FRAG_BIT_TEX() 2007-01-24 14:14:14 -07:00
Brian
ccea3ff8a9 fix varying interpolation 2007-01-24 14:13:36 -07:00
Brian
0552abce0e only setup varying vars that will be used 2007-01-24 14:13:02 -07:00
Brian
07373512c7 added FRAG_BIT_TEX() and FRAG_BIT_VAR() macros 2007-01-24 14:12:08 -07:00
Zou Nan hai
844e5610de 965 glxswapcontrol fix 2007-01-24 16:07:43 +08:00
Zou Nan hai
bdc5394d22 965 ARB_Occlusion_query fix 2007-01-24 15:47:15 +08:00
Brian
c920d201c2 updated comment 2007-01-23 17:41:25 -07:00
Brian
6d4e561e39 indicate which opcodes are used by Mesa GLSL, updated comments 2007-01-23 17:39:25 -07:00
Brian
223d7cb3c7 fix g++ warnings/errors 2007-01-23 16:37:51 -07:00
Brian
7e85b0a025 silence C++ warnings 2007-01-23 12:50:08 -07:00
Brian
18d1fdebeb fixes for C++ warnings/errors 2007-01-23 11:46:02 -07:00
Thomas Hellstrom
d46093b8d5 i915tex: Relocation fixes:
Increase the number of allowed relocations per batchbuffer.
Fix an assert to avoid an array index overflow.
(Reported by Steve Wilkins)
2007-01-23 09:06:21 +01:00
Thomas Hellstrom
fe9fef2cec i915tex: Fix randr resizing. Rotation still broken. 2007-01-23 09:06:21 +01:00
Ben Skeggs
60c28739aa nouveau: DPH and CMP for NV40 which doesn't do it natively. 2007-01-23 16:25:25 +11:00
Ben Skeggs
cf33bcf0b2 nouveau: allow for card-specific shader infos to be kept
NV30/40 fragprog: build FP_CONTROL per-shader, still some hardcoded bits for
                  this reg.. It looks like it has to do with the number of
		  temps used, but needs more looking at.
NV40 vtxprog    : build VP_IN_REG/VP_OUT_REG during shader compile
2007-01-23 16:07:12 +11:00
Ben Skeggs
a8b9d13f74 nouveau: fill in condition info for instructions 2007-01-23 13:36:45 +11:00
Ben Skeggs
ed69205684 nouveau: unbreak nv40 2007-01-23 11:06:16 +11:00
Ben Skeggs
50227f6fd2 nouveau: reindent shader pass0/pass2
if this gets rejected by the commit list, just ignore it..
nothing interesting to see here :)
2007-01-23 10:54:54 +11:00
Ben Skeggs
c3ac270996 nouveau: start converting shaders into a tree format again..
No branching stuff implemented yet.  Works enough for gears, probably
other stuff broken.
2007-01-23 10:54:54 +11:00
Jeremy Kolb
95fc270b06 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa 2007-01-21 20:47:10 -05:00
Jeremy Kolb
ea441355d3 nouveau: Fixes for nv30. 2007-01-21 20:30:31 -05:00
Stephane Marchesin
d1f0a55af4 nouveau: fix some bugs in the nv10 swtcl. 2007-01-22 00:12:05 +01:00
Brian
bc5d480e2c added shading.html link 2007-01-21 10:37:25 -07:00
Stephane Marchesin
3c0961d299 nouveau: add nv04 state support, and small nv04 fixes. 2007-01-21 04:06:57 +01:00
Ben Skeggs
4f800c5bac nouveau: rename pass0_arb to pass0.
I was expecting to have 2 frontends for the shader code (asm, glsl).
With Brian's work on GLSL this is unnecessary :)
2007-01-21 09:48:33 +11:00
Ben Skeggs
029b81742a nouveau: kill off shader pass1.
It sucks, and we have someone who can do a much better job than I can starting
work on it soon.  alloc_temp/free_temp is left in pass2 to workaround fragprog
temps/outputs overlapping, but this all belongs in the optimiser.
2007-01-21 09:31:00 +11:00
Ben Skeggs
ee3d0617f9 nouveau: shader backend branching support for all cards that support it. 2007-01-21 09:13:27 +11:00
Brian
9595d1935c Added a page with shading language status, tips, etc. 2007-01-20 13:40:57 -07:00
Brian
059e901446 Add a simple mechanism for annotating instructions for easier debugging. 2007-01-20 10:47:10 -07:00
Brian
f116fcc328 optimization: emit MAD instructions when possible 2007-01-20 09:46:02 -07:00
Brian
1f208c3546 remove unused swizzle parameter to -storage_to_src_reg() 2007-01-20 09:29:04 -07:00
Brian
5ae49cf3ed Initial implementation of OPCODE_IF/ELSE/ENDIF instructions. 2007-01-20 09:27:40 -07:00
Brian
a3e938b8da Reimplement && and || to do short-circuit evaluation.
Improved shader error handling.
2007-01-20 09:22:13 -07:00
Brian
9f07ed00e4 rewrite more __postIncr functions 2007-01-20 07:56:00 -07:00
Brian
3cec66512d Implement do/while loops. Replace IR_CJUMP with IR_CJUMP0 and IR_CJUMP1 so
we can either jump on zero, or non-zero predicate.
2007-01-19 13:13:15 -07:00
Brian
eff9690351 Rewrite normalize(vec3/vec4) to use one less register. 2007-01-19 12:19:38 -07:00
Brian
dceae2829e report error message when something fails 2007-01-19 12:02:31 -07:00
Brian
203946e1f9 print error msg when there's a problem 2007-01-19 12:02:06 -07:00
Brian
74b27674a8 remove stray tab 2007-01-19 10:31:52 -07:00
Brian
a0092c51b1 Implement fragment discard/kill. 2007-01-19 10:15:34 -07:00
Brian
8374ccb66f change while-loop to create new scope for loop body, per spec 2007-01-19 10:02:58 -07:00
Ben Skeggs
669fefd3da nouveau: bump drm patchlevel 2007-01-19 15:39:36 +11:00
Brian
16183e6430 Implement constant sharing so that 4 float constants can share a single
float[4] register slot.
2007-01-18 17:29:23 -07:00
Brian
ce6640001d _mesa_add_unnamed_constant() now tries to re-use constants already in
the parameter list.
2007-01-18 17:23:48 -07:00
Brian
d70771752f Reimplement code for swizzling so that expressions like (p+q).x for vectors p and q works correctly. 2007-01-18 15:35:44 -07:00
Brian
d885ff470a rewrite a bunch of assignment operators (like +=) 2007-01-18 15:33:13 -07:00
Brian
e4e66476a9 remove debug code 2007-01-18 15:23:45 -07:00
Patrice Mandin
3c59483ed7 nouveau: preliminary nv50 state 2007-01-18 22:07:17 +01:00
Brian
f43eac3ed8 remove swizzle param from new_var() 2007-01-18 09:22:44 -07:00
Aapo Tahkola
62efc4ba3e support as much of GL_EXT_stencil_two_side as we can. untested. 2007-01-18 05:56:13 +02:00
Aapo Tahkola
feeed10dfd typo fix. this case still fails. 2007-01-18 05:30:20 +02:00
Aapo Tahkola
a3b4b11739 Fix invalid enums passed to MapBuffer 2007-01-18 04:46:04 +02:00
Aapo Tahkola
2cb3594af9 Fix invalid enums passed to MapBuffer 2007-01-18 04:17:56 +02:00
Brian
8a2368edce rewrite additional matrix-related functions to reduce register needs 2007-01-17 18:37:20 -07:00
Brian
89a3bafe04 rewrite mat4 * mat4 operator to use fewer temps 2007-01-17 18:30:53 -07:00
Brian
272622a2e0 do bounds check in _slang_push_var_table(), added comment 2007-01-17 18:21:00 -07:00
Brian
2585b74e19 rewrite matrix constructors 2007-01-17 18:06:40 -07:00
Brian
4864aaeb02 handle var size > 4 in _slang_pop_var_table() 2007-01-17 18:02:44 -07:00
Brian
f4e345c1a8 minor fprintf() change 2007-01-17 16:30:11 -07:00
Brian
eb0c478b17 Rewrite a bunch of constructors. It's now important that the first
constructor for any given type be the one that takes the most parameters
as this is the constructor that'll be used when there's no perfect match
to the caller's arguments.
See the _slang_adapt_call() function for details.
2007-01-17 16:29:51 -07:00
Brian
3a3bb953b6 _slang_gen_function_call_name() now tries to adapt function calls (expand
vectors, insert casts) when a perfect match isn't found.
2007-01-17 16:14:03 -07:00
Brian
eabb7e66bd New _slang_adapt_call() function.
This is used to modify function calls (when possible) to make the arguments
map to the function parameters.  This includes "unrolling" vector types
and doing casts.

Example:
   vec2 v2 = vec2(1.2, 3.4)
   ivec3 iv = ivec3(false, v2);
Is converted into:
   ivec3 iv = ivec3(int(false), int(v2[0]), int(v2[1]))
2007-01-17 16:11:50 -07:00
Brian
397b807ad5 code clean-up, re-org. Added IR_F_TO_I support. 2007-01-17 16:05:03 -07:00
Brian
bb53124fca added IR_F_TO_I, update comments 2007-01-17 15:58:24 -07:00
Brian
0bad236cfb Added OPCODE_INT to convert 4 floats to 4 ints. 2007-01-17 15:54:14 -07:00
Brian
46a9241248 add texturing, other options 2007-01-17 10:25:44 -07:00
Brian
811f54fa75 Fix/clean-up a number of things related to variable/temporary allocation. 2007-01-17 09:54:31 -07:00
Keith Whitwell
3bfbe63806 New debug config for linux-dri 2007-01-17 08:44:13 +00:00
Xiang, Haihao
747c9129c0 I965: fix bug#9625-get the correct PV for quardstrip
The order of vertices in payload for quardstrip is (0, 1, 3, 2),
so the PV for quardstrip is c->reg.vertex[2].
2007-01-17 10:39:50 +08:00
Xiang, Haihao
afba8f0d30 Fix bug#9673
Cast from pointer to unsinged long and cast to pointer from
 unsinged long
2007-01-17 10:17:10 +08:00
Brian
552a65e454 Implement codegen for the selection operator ( b ? x : y ) 2007-01-16 17:38:39 -07:00
Brian
3596903068 fix typo 2007-01-16 16:53:41 -07:00
Brian
271d504ed7 draw a box, press 'a' to animate 2007-01-16 15:27:11 -07:00
Brian
9d0ae967d4 added some VerteAttrib funcs 2007-01-16 14:57:12 -07:00
Brian
f44ba11815 Added toyball and bumpmap tests using shaders from the OpenGL Shading Language (orange) book. 2007-01-16 14:55:43 -07:00
Brian
9b5dc1358a when automatically binding vertex attributes, start with attrib 1, not 0 2007-01-16 14:52:22 -07:00
Brian
4f027a33b9 remove dead code 2007-01-16 14:19:37 -07:00
Brian
0f91310bf3 comments 2007-01-16 14:17:57 -07:00
Brian
d90c655b05 implement logical or, xor, not 2007-01-16 14:15:05 -07:00
Brian
99e788fe56 some additional vector constructors 2007-01-16 14:10:30 -07:00
Stephane Marchesin
7c8f311e40 nouveau: Use the most recent card list. 2007-01-16 21:43:54 +01:00
Brian
156e583a35 fix _slang_gen_subscript() for the case when a simple vector is accessed as an array: convert index to a swizzle/writemask 2007-01-16 10:45:34 -07:00
Keith Whitwell
fea6e5a695 Don't special-case index, edgeflag.
Remove display list opcodes for INDEX and EDGEFLAG, handle them
through the regular ATTRIB mechanism now that Mesa understands them
to just be regular attribs.
2007-01-16 13:30:04 +00:00
Keith Whitwell
c53df49b8b Additional display list tests 2007-01-16 13:29:01 +00:00
Keith Whitwell
3ad12fab45 Merge vbo_0_1_branch
Hopefully leaving behind the cruft generated by the CVS import.
2007-01-16 11:24:08 +00:00
Keith Whitwell
6a3fdc3a1e Merge branch 'master' of git+ssh://keithw@git.freedesktop.org/git/mesa/mesa into vbo-0.2
Conflicts:

	src/mesa/array_cache/sources
	src/mesa/drivers/dri/i965/brw_context.c
	src/mesa/drivers/dri/i965/brw_draw.c
	src/mesa/drivers/dri/i965/brw_fallback.c
	src/mesa/drivers/dri/i965/brw_vs_emit.c
	src/mesa/drivers/dri/i965/brw_vs_tnl.c
	src/mesa/drivers/dri/mach64/mach64_context.c
	src/mesa/main/extensions.c
	src/mesa/main/getstring.c
	src/mesa/tnl/sources
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_save_playback.c
	src/mesa/tnl/t_vtx_api.c
	src/mesa/tnl/t_vtx_exec.c
	src/mesa/vbo/vbo_attrib.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_api.c
	src/mesa/vbo/vbo_save_draw.c
2007-01-16 11:22:57 +00:00
Keith Whitwell
0b412f8f15 Merge branch 'vbo_0_1_branch' into vbo-0.2 2007-01-16 09:47:35 +00:00
Keith Whitwell
5363e3331b Merge branch 'master-merge' into vbo-0.2 2007-01-16 09:47:26 +00:00
Brian
0d55346156 Use arrow keys to pan and z/Z to zoom in/out to explore the fractal. 2007-01-15 17:48:19 -07:00
Brian
2ccd264695 Added new directory of GL shading language demos: glsl 2007-01-15 17:27:24 -07:00
Brian
f6507157e2 Reimplement the post-increment/decrement functions.
Instead of defining functions with an extra dummy parameter to distinguish
from the pre-incr/decr functions, just use new function names: __postIncr
and __postDecr.
2007-01-15 16:54:38 -07:00
Brian
c410994653 Implement the ++var and --var operators, improve some constructors. 2007-01-15 16:38:12 -07:00
Brian
0a097675f1 added vec3 constructor code 2007-01-15 16:34:33 -07:00
Brian
82258b7af3 added IR_ELEMENT 2007-01-15 16:33:54 -07:00
Brian
04ac15fd80 checkpoint: ++, -- and && operators 2007-01-15 15:51:49 -07:00
Brian
83d3ff590d Redo the way array indexes are handled. Resolve storage location at code emit time, not codegen time. 2007-01-15 13:58:45 -07:00
Jerome Glisse
a03fc82771 mesa: Update _Current along Current on fragment program bound.
Same as a previously committed patch for vertex program, we
update fragment program ptr _Current along the Current one
so that _Current can't end up pointing to a no more valid
program.
2007-01-15 21:21:10 +01:00
Brian
c807169888 remove old globals 2007-01-15 11:10:11 -07:00
Brian
a5bbe206a8 comments 2007-01-15 11:08:10 -07:00
Brian
8de3dc1701 Move some global vars into slang_assemble_ctx. 2007-01-15 11:07:46 -07:00
Patrice Mandin
7520478eb0 nouveau:nv10: fix setting clip region 2007-01-15 18:58:24 +01:00
Brian
4f5901b265 fix the subassig, mulassign and divassign cases 2007-01-15 10:35:59 -07:00
Brian
629fd78f79 clean-up slang_allocate_storage() 2007-01-15 10:35:03 -07:00
Keith Whitwell
584def75ad Remove unused index buffer. 2007-01-15 16:57:01 +00:00
Keith Whitwell
6ff9b48fe2 Don't special-case FOG attribute initialization.
Initial fog value was being set to {0,0,0,0}.  This results in vector
size 4, but isn't necessary.  The regular {0,0,0,1} works fine.
2007-01-15 14:30:16 +00:00
Keith Whitwell
50f76b9d9b Correctly initialize current attribute sizes.
Some legacy attributes (eg color) have an initial value other than {0,0,0,1}
which means that their initial size != 1 either.
2007-01-15 14:20:21 +00:00
keithw
82152a2a8e Remove debug, reenable inplace splitting. 2007-01-15 14:10:42 +00:00
Keith Whitwell
5464cd0a60 Split too-large draw commands.
Use the vbo_split_ functionality to split incoming drawing command
to fit within the fixed-size buffers used by software t&l module.
2007-01-15 13:54:08 +00:00
Keith Whitwell
2421b25dd7 Remove special-case handling for index and edgeflag
This isn't required with the changes to core mesa and the new
attribute layout.
2007-01-15 13:40:38 +00:00
keithw
1b7c24c33c Hook in split functionality 2007-01-15 11:58:06 +00:00
keithw
4557dfe132 Add vbo_split files 2007-01-15 11:54:40 +00:00
keithw
a38cb37913 New files to manage splitting drawing commands 2007-01-15 11:52:58 +00:00
Stephane Marchesin
4c7d36b688 nouveau: Fix a bug in the nv04 swtcl. 2007-01-15 12:38:24 +01:00
Ben Skeggs
16f35a3a22 nouveau: Add 0x0244 pciid manually for now..
pciids.sf.net is slow to add it so our generator picks it up,
and it's *really* annoying me :)
2007-01-15 17:28:56 +11:00
Ben Skeggs
634b4b3487 nouveau: fail CreateScreen on unknown cards instead of guessing. 2007-01-15 17:23:04 +11:00
Carlos Martín Nieto
89f91d1804 nouveau: Implement much of the fog handling. 2007-01-15 00:00:30 +01:00
Stephane Marchesin
e2295511f5 nouveau: Update nouveau_reg.h from renouveau to the latest version. 2007-01-14 22:39:37 +01:00
Stephane Marchesin
65e3d5e45e nouveau: Make the state cache hierarchical. 2007-01-14 21:17:08 +01:00
Stephane Marchesin
8d7e5651fb nouveau: add the nv04 swtcl module (it's untested for now). 2007-01-14 20:39:00 +01:00
Stephane Marchesin
d57ce408b3 nouveau: Cleanup the nv10 swtcl module. 2007-01-14 20:39:00 +01:00
Patrice Mandin
81bd826de8 nouveau: nv10: 16 bits color buffer format 2007-01-14 20:14:58 +01:00
Patrice Mandin
eae7acac16 Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa 2007-01-14 19:56:30 +01:00
Patrice Mandin
8aabd636f5 nouveau: nv10: added missing functions 2007-01-14 19:55:45 +01:00
Jerome Glisse
9a4e49aef2 r300: Fix vertex program position invariant bug, force position reading.
When we have a position invariant program we need to force routing the
position otherwise you may handle transform quite random data which might
be funny but unlikely what you want :).
2007-01-14 19:32:22 +01:00
Jerome Glisse
6dd967e74f mesa: Update _Current ptr along Current when a new vertex program is bind.
On new vertex program bind only the Current ptr where updated to
point to the new program; this could lead to _Current pointing to
and out of date or even a no more existing program which in turn
could lead to a segfault in some driver. To avoid this _Current
ptr is updated along Current if _Current where previously pointing
to the same program.
2007-01-14 14:49:36 +01:00
Patrice Mandin
e7112be732 nouveau: remove already defined NV15_TCL and NV17_TCL 2007-01-14 14:11:10 +01:00
Patrice Mandin
86f10c7144 nouveau: import color material r,g,b,a 2007-01-14 14:09:04 +01:00
Patrice Mandin
faada2485a nouveau: nv10: stencil functions 2007-01-14 14:03:42 +01:00
Patrice Mandin
29484f24fb nouveau: nv10: currently fails initcard and bindbuffers, till done 2007-01-14 12:51:30 +01:00
Patrice Mandin
f1ad10b338 nouveau: nv10 blending done, remove nv10Viewport 2007-01-14 12:45:15 +01:00
Brian
64414ea0e9 added glUniform1fv_func, glUniform2fv_func 2007-01-13 14:51:02 -07:00
Brian
691ed5e54b Rework code related to temp register allocation, both for user variables
and expression temporarires.  Much better register utilization now.
Lots of other fixes.
The OpenGL GLSL "orange book" brick shader demo works now.
2007-01-13 14:49:52 -07:00
Brian
5daa99d2a4 slang_variable_scope now stores array of pointers to slang_variables. 2007-01-13 14:47:48 -07:00
Brian
97c7937c65 added another vec4 constructor, updated += operator 2007-01-13 14:46:12 -07:00
Patrice Mandin
fb5f359b93 nouveau: update nv10 state 2007-01-13 14:14:19 +01:00
Patrice Mandin
308ef2dc32 nouveau: Add clear color for nv10 2007-01-13 13:56:18 +01:00
Patrice Mandin
ca75853f9d nv10 has alpha color mask 2007-01-13 13:22:03 +01:00
Brian
95a441112e Fix a problem with inlined "return" statements. Make some attempt to free temporaries. 2007-01-11 11:22:26 -07:00
Brian
063f3f7fc4 disable some code that'll eventually go away 2007-01-11 11:21:38 -07:00
Brian
749ed66549 new vec3 constructor, replace float_add w/ vec4_add 2007-01-11 11:20:23 -07:00
Brian
c8e148e38c tweak output 2007-01-11 11:19:11 -07:00
Jerome Glisse
b55f1ec9af Fix typo from commit 1d312ae013 . 2007-01-11 12:54:42 +01:00
Brian
c0c31024a3 checkpoint: codegen for global vars/constants now working 2007-01-10 13:51:48 -07:00
Brian
88e2dbfd10 checkpoint: codegen for global vars w/ initializers 2007-01-10 13:33:38 -07:00
Brian
8a48f35574 assorted code clean-ups 2007-01-10 12:18:50 -07:00
Brian
ee11842bfc fix size bug in _mesa_add_attribute() 2007-01-10 12:18:33 -07:00
Brian
29bff4e12d simplify _mesa_add_state_reference() 2007-01-10 08:37:59 -07:00
Brian
88f7212312 Update _save_VertexAttrib() functions for non-aliasing behaviour. 2007-01-10 08:15:35 -07:00
Brian
01a91eb657 get rid of STATE_USER_ATTRIB/STATE_AUTO_ATTRIB 2007-01-09 19:26:22 -07:00
Brian
b7978af693 clean up a bunch of program parameter stuff 2007-01-09 19:17:17 -07:00
Brian
cc858bfa84 added a few more 2.0 functions 2007-01-09 17:49:53 -07:00
Brian
3209c3ed0d Implement vertex attribute binding.
Users can set explicit binding with glBindAttribLocation(), otherwise the
linker will allocate generic attribute slots.
2007-01-09 17:49:24 -07:00
Brian
5e75db12d7 more debug code (disabled) 2007-01-09 17:47:13 -07:00
Brian
e8673143ea add code for generic attributes 16..31 2007-01-09 17:46:45 -07:00
Eric Anholt
3dd243c59e Track rename of DamagePost -> DamageAdd. 2007-01-09 16:39:10 -08:00
Brian
048412473b added _mesa_count_texture_indirections(), _mesa_count_texture_instructions() 2007-01-09 11:00:47 -07:00
Brian
21f99792a9 Moved NumTexInstructions, NumTexIndirections, etc. into gl_program since
they can now apply to vertex programs.
2007-01-09 11:00:21 -07:00
Brian
ae80d13f6d remove old comment 2007-01-09 10:10:59 -07:00
Brian
829da4c345 Vertex program texture samplers done, but untested (need to add TEX/TXB to
the T&L vertex program interpreter).
2007-01-09 09:31:30 -07:00
Brian
855ebb26d1 Implement shadow samplers and dFdx(), dFdy() code generation. 2007-01-09 09:14:32 -07:00
Roland Scheidegger
96c5db5f7a put back missing Driver.PolygonMode call (bug 9578) 2007-01-09 14:42:22 +01:00
Michel Dänzer
dfabf96607 i915tex: Remove unused tex_program field. 2007-01-09 12:46:50 +01:00
Michel Dänzer
92fb742065 intel_finalize_mipmap_tree: Only flush batchbuffer when necessary. 2007-01-09 12:46:50 +01:00
Brian
20aec24ac7 implement biased texture functions 2007-01-08 16:56:52 -07:00
Brian
41a4e828d9 check if _Current == NULL for TXB 2007-01-08 16:49:43 -07:00
Brian
8cad795a80 added 1D texture functions 2007-01-08 16:10:55 -07:00
Brian
9a78ef980d Remove if (tObj) conditional so that texture units without a texture image
return black (0,0,0,1) when sampled.
2007-01-08 16:10:34 -07:00
Brian
85e0634b54 update texture1D functions 2007-01-08 16:02:40 -07:00
Brian
42153d7858 Implement projective texture sampling, 3D textures. Disable some debug output. 2007-01-08 15:58:14 -07:00
Brian
483ca39bca Move some code around, add some comments. 2007-01-08 14:11:54 -07:00
Brian
d3fe7398e3 Move storage allocation functions from slang_emit.c to slang_codegen.c 2007-01-08 14:06:00 -07:00
Brian
27cc9068ce checkpoint: more work on variable/storage allocation 2007-01-08 13:36:53 -07:00
Brian
cf4d4342c9 Checkpoint: re-org of (global) variable allocation code. More to come... 2007-01-08 13:09:47 -07:00
Keith Packard
d9dd9013a8 Merge branch 'origin' 2007-01-07 23:00:48 -08:00
Ben Skeggs
026939b008 nouveau: allow the use of multiple subchannels/objects by default. 2007-01-08 11:54:39 +11:00
Keith Packard
62db3cc349 Various warning fixes for i965 driver.
vertex/fragment programs provided as const.
bmSetFenceLock should return bmSetFence value.
2007-01-06 17:13:45 -08:00
Keith Packard
9311c29558 Initialize GL_ARB_occlusion_query only if DRM support is present.
DRM versions before 1.8 do not include the necessary ioctls to support
GL_ARB_occlusion_query, don't enable it on these versions.
2007-01-06 17:13:29 -08:00
Haihao Xiang
8c1cc5fd80 i965: Support linear format in i965.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:44:57 -08:00
Zou Nan hai
ef02f8be10 i965: xdemos/glxthreads get: Assertion `block->fenced' failed (9201)
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:18:23 -08:00
Zou Nan hai
652ae2c376 i965: Take clip rects into account when computing max prim
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:18:23 -08:00
Wang Zhenyu
4068e2d1b7 i965: ARB_occlusion_query support
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:18:23 -08:00
Eric Anholt
1b9f78195f i965: Avoid branch instructions while in single program flow mode.
There is an errata for Broadwater that threads don't have the instruction/loop
mask stacks initialized on thread spawn.  In single program flow mode, those
stacks are not writable, so we can't initialize them.  However, they do get
read during ELSE and ENDIF instructions.  So, instead, replace branch
instructions in single program flow mode with predicated jumps (ADD to the ip
register), avoiding use of the more complicated branch instructions that may
fail.  This is also a minor optimization as no ENDIF equivalent is necessary.

Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:18:23 -08:00
Eric Anholt
e54ec49155 i965: Connect INTEL_DEBUG=sync up to cmd/batch ioctls.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
2007-01-06 15:18:22 -08:00
Brian
f1fbaf39ff Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-01-06 14:55:07 -07:00
Brian
ade39f53f6 document 32-bit Z line/point fix 2007-01-06 12:58:28 -07:00
Brian
113b0a7f2e Use GLuint instead of GLint to store intermediate Z values. Fixes problems when using 32-bit Z buffer. 2007-01-06 12:55:17 -07:00
Eric Anholt
c2b185cff8 Add reporting of damage by DRI drivers when the extension support is available.
With this, tools like ximagesrc in gstreamer correctly see updates from GL
rendering.  Support requires that the Xdamage library be current (but will be
disabled if not present) plus a new X Server with support for the new
XDamagePost request.  libGL now has a new interface version, and also links
against libXdamage and libXfixes to support it, but backwards compatibility
is retained.

Currently, all drivers report damage at SwapBuffers time through common code --
front buffer rendering doesn't result in damage being reported.  Also, the
damage is against the root window, as our drivers don't yet render to backing
store when they should (composited environments).
2007-01-05 18:23:57 -08:00
Brian
5cf7326132 Checkpoint glsl compiler work: sampler uniforms now implemented, linked properly. 2007-01-05 16:02:45 -07:00
Brian
b2ab693d68 added PROGRAM_SAMPLER 2007-01-05 16:01:43 -07:00
Brian
eef70ff79a added Sampler field to prog_instruction struct 2007-01-05 16:01:26 -07:00
Brian
288c5396e6 added PROGRAM_SAMPLER 2007-01-05 16:01:11 -07:00
Brian
9805e76744 added _mesa_add_sampler() 2007-01-05 16:00:57 -07:00
Brian
b530d96216 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-01-05 08:42:45 -07:00
Brian
24cf67fc73 document VBO bug fix 9445 2007-01-05 08:41:16 -07:00
Brian
7da7404fdf Fix glPush/PopClientAttrib() for VBO state (bug 9445). 2007-01-05 08:40:06 -07:00
Ian Romanick
16f0efca60 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa 2007-01-04 18:37:10 -08:00
Brian
4cc90ee0b0 update TexturesUsed[] in slang_update_inputs_outputs() 2007-01-04 17:44:04 -07:00
Brian
4428e8f20f update TexturesUsed[] in slang_update_inputs_outputs() 2007-01-04 17:43:53 -07:00
Brian
64f78dd6a8 compute InputsRead/OutputsWritten with slang_update_inputs_outputs() 2007-01-04 17:30:30 -07:00
Brian
c9db223f90 move TexturesUsed[] into gl_program since vertex programs/shaders can use textures nowadays 2007-01-04 17:22:19 -07:00
Brian
7edd2ecb55 simplify update_texture_state() a bit, compute _EnabledCoordUnits for shaders 2007-01-04 16:19:54 -07:00
Ian Romanick
5ca107a4f2 Use glxbyteorder.h in server-side source files. 2007-01-04 14:53:48 -08:00
Ian Romanick
6d29e1de73 Hack indent flags for indirect_reqsize.h to eliminate extra diffs. 2007-01-04 14:52:53 -08:00
Ian Romanick
92be800146 Add missing files to server generation list.
The files indirect_reqsize.c and indirect_reqsize.h were missing from
the list of files to be generated for the server.  Add them back to
the list.  Also, update the INDENT_FLAGS to prevent conversion of
'GLbyte *pc' to 'GLbyte * pc' in function prototypes.
2007-01-04 14:47:41 -08:00
Brian
ff81f074fb minor formatting fix 2007-01-04 15:25:29 -07:00
Brian
de03fe4a3f added texture attribs in slang_find_input() 2007-01-04 15:06:50 -07:00
Brian
7b4d10b4a3 added glUniform1i_func 2007-01-04 14:40:56 -07:00
Brian
e640300602 initial code to get texture sampling limping along 2007-01-04 14:40:02 -07:00
Brian
6a92d98d1a temporary disable some memory deallocations to work around a memory corruption bug 2007-01-04 14:38:45 -07:00
Brian
89dc48569a finish some loose ends in _mesa_uniform() 2007-01-04 14:35:44 -07:00
Brian
602045fd7b update_texture_state() updated for new shaders 2007-01-04 14:33:42 -07:00
Jerome Glisse
1d312ae013 r300: Correct bug introduced by fragprog rework.
Thx for Tilman who spoted the bugs.
2007-01-04 20:31:35 +01:00
Brian
439758353a Fix some incorrect GL error values. Reorganize _mesa_compile_shader() code. 2007-01-04 08:21:09 -07:00
Brian
8d287d0f5e s/unsigned/size_t/ (Matthias Hopf) 2007-01-04 07:53:32 -07:00
Patrice Mandin
bbfd963f49 Update spot light params 2007-01-02 14:31:16 +01:00
Ben Skeggs
254ce75ac3 nouveau: bump drm patchlevel. 2007-01-02 15:59:05 +11:00
Dave Airlie
b6becfae10 fix issue with i915tex advertising visuals it can't support
This may not be the proper way to fix this but it does work easily.
2006-12-31 10:01:17 +11:00
Haihao Xiang
3943d7f8b1 Use the tiled flag in the sarea to determine region tiling.
This fixes mis-rendering if back/depth fail to get set up as tiled.  While it
probably won't ever be the case now that the pitch limits are loosened, this is
still the right thing to do.
2006-12-30 10:30:42 -08:00
Ben Skeggs
8c180c72d5 nouveau: Use bufferobj interface for fragment program uploads 2006-12-27 23:53:26 +11:00
Ben Skeggs
9a20ae70ec nouveau: Initial buffer object support 2006-12-27 23:53:25 +11:00
Ben Skeggs
1780fd4eee nouveau: We'll need syncNotifier for NV_MEMORY_TO_MEMORY_FORMAT too. 2006-12-27 23:53:25 +11:00
Ben Skeggs
885a7cc38d nouveau: add nouveau_mem_alloc/free debugging 2006-12-27 23:53:25 +11:00
Ben Skeggs
2dd3753450 nouveau: record *actual* type of memory that was alloc'd, not the requested types. 2006-12-27 23:53:25 +11:00
Ben Skeggs
7b59a424b5 nouveau: Typo 2006-12-27 23:53:25 +11:00
Ben Skeggs
297a35eb69 nouveau: Add simple wrapper for NV_MEMORY_TO_MEMORY_FORMAT. 2006-12-27 23:53:25 +11:00
Jerome Glisse
2dccca57e4 Deleted unused file which likely have be reintroduced during git move.
This file was deleted longtime ago, guess that git migration
created it again.
2006-12-26 18:42:17 +01:00
Ben Skeggs
257e3d1d59 nouveau: Make use of NOUVEAU_DEBUG for shader disasm 2006-12-26 22:03:12 +11:00
Ben Skeggs
3fcb7d388d nouveau: Make the notifier stuff actually work.. 2006-12-26 21:36:15 +11:00
Ben Skeggs
0b2b2de6cf nouveau: Wait on notifier to check for completion of previous commands.
We can't wait on NV_PGRAPH_STATUS.  We don't have the regs mapped, and there's
no guarantee that we'll catch PGRAPH idle when multiple channels are active.
2006-12-26 21:36:15 +11:00
Ben Skeggs
c0a63d8e5e nouveau: Add notifier support functions 2006-12-26 21:36:15 +11:00
Jerome Glisse
b8769f318f Rework r300 fragprog avoid using bitfield structure.
It seems that bitfield structure lead to some strange
problem on 64bits arch, don't want to waste time debugging
strange things like that so converted pfs_reg_t structure
to a GLuint and use good old masking and shifting spell.
(cherry picked from 2a7de9d095d8e60da12b11aaa1efe664b87b11d3 commit)
2006-12-25 23:40:20 +01:00
Ben Skeggs
d79323bd42 nouveau: Kill some compile warnings. 2006-12-24 00:50:13 +11:00
Ben Skeggs
f54c725497 nouveau: Modify span routines to use nouveau_renderbuffer instead of driRenderbuffer 2006-12-24 00:13:34 +11:00
Ben Skeggs
cb6a400dcd nouveau: maintain numClipRects/pClipRects in context. 2006-12-23 23:51:24 +11:00
Ben Skeggs
ae8d8d1326 nouveau: Don't fill nrb->dPriv for private buffers 2006-12-23 23:03:55 +11:00
Ben Skeggs
1dd6759c05 nouveau: get 16bpp working 2006-12-23 10:56:19 +11:00
Brian
d8babcfc57 fix typos 2006-12-22 10:26:22 -07:00
Brian
aa710c3e6b implement unary +, - 2006-12-22 10:18:50 -07:00
Brian
9b694589e9 chmod a-x 2006-12-21 18:12:03 -07:00
Brian
01f2e7f62f checkpoint: pre/post incr/decr operators 2006-12-21 18:05:06 -07:00
Brian
392d9701e3 added INTERP_VARYING code 2006-12-21 17:50:22 -07:00
Brian
eb2a6d62f9 s/attribute/varying/ 2006-12-21 17:50:07 -07:00
Brian
2905385744 comment about uniforms 2006-12-21 11:21:26 -07:00
Brian
58af54c767 checkpoint: rewrite vec/mat products 2006-12-21 10:56:09 -07:00
Brian
c155ae1dfe fix typos 2006-12-21 10:49:27 -07:00
Brian
a0d6b506cd added IR_NEG for negation 2006-12-21 10:47:28 -07:00
Brian
356f8ea213 checkpoint: matrix/float, unary negation rewrite 2006-12-21 10:45:49 -07:00
George Sapountzis
b766643e5c Drop mesa wrappers for XFree86. 2006-12-21 19:41:08 +02:00
Brian
c73e07405c checkpoint: ivec/int and mat/mat operations 2006-12-21 10:03:15 -07:00
Brian
bb1bf8b3aa checkpoint: more basic math rewritting 2006-12-21 09:40:08 -07:00
Sean D'Epagnier
af0190bc6e Updated keyboard input so that glut programs can read from stdin without
problems if tty input is used.  Also corrected a few stdin keycodes.
2006-12-21 01:50:33 -07:00
Brian
a33532f5f4 checkpoint: re-org assignment operator functions 2006-12-20 18:04:59 -07:00
Brian
1ff1e89ff4 added glUniformMatrix2/3fv_func 2006-12-20 17:56:29 -07:00
Brian
cec316c9eb checkpoint: more basic math operator re-org 2006-12-20 17:55:42 -07:00
Brian
8d239a6880 Checkpoing: re-organization of basic arithmetic functions. 2006-12-20 17:43:56 -07:00
Brian
2a62cbd24b handle PROGRAM_UNIFORM, fix a _mesa_problem() call 2006-12-20 17:19:45 -07:00
Brian
3a8e2776a6 Uniform matrix support.
Implement _mesa_uniform_matrix()
Support for program parameters/uniforms with more than 4 elements.
Store 4x4 matrices in column-major order in registers.
Update mat mul built-in functions accordingly.
2006-12-20 17:19:16 -07:00
Brian
83ca3ff384 added _mesa_print_parameter_list() 2006-12-20 17:17:38 -07:00
Brian
2cc7dba718 New IR_COND node for evaluating conditional expressions (for if/while/for). 2006-12-20 12:41:59 -07:00
Brian
79a340bc15 use cast wrappers for sanity checking 2006-12-20 09:57:56 -07:00
Brian
f2923613a4 code re-org 2006-12-20 09:56:44 -07:00
Brian
d881a9c136 Minor clean-ups, reformatting, comment changes. 2006-12-20 09:31:07 -07:00
Brian
9e4bae9cca Fix shader object reference counting and hash table deallocation. 2006-12-20 09:27:42 -07:00
Brian
65a18442e5 Clean-up and re-org of the main GLSL object types.
Use the gl_shader struct as it should be.
Renamed gl_linked_program to gl_shader_program.
Store both shaders and programs in the same hash table and use the Type field
to distinguish them.
2006-12-19 18:46:56 -07:00
Brian
0bf5dbe002 Overhaul of GLSL API functions, dispatching, etc. 2006-12-19 18:02:41 -07:00
Brian
5b01c5e9d2 Overhaul of GLSL API functions, dispatching, etc. 2006-12-19 18:02:03 -07:00
Brian
46b06bdb26 Massive re-org of GLSL-related API functions.
Added new GLSL functions to struct dd_function_table.
main/shaders.c calls GLSL functions through the dd_function_table.
shader/shader_api.c implements the API functions.
Other assorted changes, fixes everywhere else.
2006-12-19 17:59:32 -07:00
Dave Airlie
e3358dea66 Merge branch 'nouveau-import' 2006-12-20 09:30:32 +11:00
Brian
2e76f0a846 check for null Parameters ptr in _mesa_clone_program() 2006-12-19 09:52:07 -07:00
Brian
af1d46b68a lots of clean-up and re-org 2006-12-19 08:59:51 -07:00
Brian
bb8f7627f7 additional error checking 2006-12-19 08:59:36 -07:00
Brian
8473ae475f new error msg 2006-12-19 08:59:19 -07:00
Brian
194bc5afbd rewrite +=, -= etc for floats 2006-12-19 08:58:56 -07:00
Brian
8e20c417d4 Implement array indexing of simple vec2/3/4 types. A bit of a hack for now... 2006-12-18 17:54:58 -07:00
Brian
d22079217c Added instruction counter to catch infinite loops (temporary). 2006-12-18 16:22:27 -07:00
Brian
b50280e95f Check for inst->CondUpdate, print .C suffix. 2006-12-18 16:21:58 -07:00
Brian
fbb71da2b9 Generate IR code for for/while loops, break and continue statements. 2006-12-18 14:45:26 -07:00
Brian
1aee657b0f Implement if-conditionals and while loops, added temporary resolve-branches function in linker. 2006-12-18 10:05:24 -07:00
Brian
34ae99d604 GLSL API functions. 2006-12-18 08:28:54 -07:00
Brian
ad2519ac6b Use _mesa_free_linked_program_data() 2006-12-18 08:28:06 -07:00
Brian
962a9f2f9d comments 2006-12-18 08:25:23 -07:00
Ben Skeggs
53d40646bd Don't build passthrough shader on <NV40 2006-12-17 03:38:21 +00:00
Brian
0031ea7d85 fix comment, handle NOP 2006-12-16 12:52:55 -07:00
Brian
f7159552ae Initial code for conditional constructs. 2006-12-16 12:52:19 -07:00
Brian
3a2815370d print BRA instructions 2006-12-16 12:51:34 -07:00
Brian
3e1f4bc15b added cases for BRA, NOP 2006-12-16 12:51:12 -07:00
Brian
b456413d76 cases for NOP, BRA 2006-12-16 12:50:51 -07:00
Brian
b497a0cb7c Don't update span->array->z[] values from SLANG_FRAGMENT_FIXED_FRAGDEPTH.
This restores the behaviour of Mesa 6.5.1, fixing a regression in 6.5.2.
See bug 9345.  Revisit someday...
2006-12-16 11:17:41 -07:00
Brian
6ec4a03b9f initial release notes for 6.5.3 2006-12-16 11:09:14 -07:00
Brian
6d982e53ee don't allow fog when using a fragment shader (bug 9346) 2006-12-16 11:07:00 -07:00
Ben Skeggs
de947e8a5b Get nv10_swtcl.c working enough for glxgears on NV40. 2006-12-16 12:32:11 +00:00
Brian
a4be104887 start implementing relational operators 2006-12-15 17:05:53 -07:00
Brian
cb7ccc4b14 start rewriting the matrix/vector functions 2006-12-15 16:47:42 -07:00
Brian
f167d0e7d5 added assertion to catch use of too many temporaries 2006-12-15 15:37:32 -07:00
Brian
fa8059a89c fix double-printing of comment info 2006-12-15 15:36:29 -07:00
Brian
9b00fa9ac2 code movement 2006-12-15 15:36:09 -07:00
Brian
bfc02dd30f Lots of assorted changes.
Implement assignment/move for types larger than 4 floats.
Fix codegen bug for "return expr" in inlined functions.
More clean-up of storage allocation code (slang_resolve_storage).
2006-12-15 15:35:57 -07:00
Brian
6579245800 redo mat4 addition, mat4 constructor from vec4s 2006-12-15 15:32:11 -07:00
Gary Wong
24a495fd77 Fix copy-and-paste mistake in comment ("scaling" should read "translation").
Before _mesa_Translatef().
2006-12-15 17:18:36 -05:00
Ben Skeggs
c340dd7d84 NV1x/2x hw_func stubs. 2006-12-15 21:02:23 +00:00
Brian
4b4632f94c vertex/fragment program field changes 2006-12-15 10:10:23 -07:00
Brian
d6aff512fe varying var changes 2006-12-15 10:10:01 -07:00
Brian
464b9f4f6c varying var changes 2006-12-15 10:09:49 -07:00
Brian
9abf73b8cc varying changes 2006-12-15 10:09:33 -07:00
Brian
a7e252026d updated includes 2006-12-15 10:09:12 -07:00
Brian
60a7200c0d updated includes 2006-12-15 10:08:59 -07:00
Brian
89f88058b9 use MAX_VARYING 2006-12-15 10:08:24 -07:00
Brian
e3b2668865 use MAX_VARYING 2006-12-15 10:08:15 -07:00
Brian
a7a582296b more debug output 2006-12-15 10:08:02 -07:00
Brian
a90046f109 Lots of assorted changes for new GLSL compiler backend.
New datatypes, constants, variables.
2006-12-15 10:07:26 -07:00
Brian
becb393d42 Use extfuncs.h helper. Added command line options for loading
vertex/fragment shaders from files.
2006-12-15 09:31:14 -07:00
Brian
e55b771a1e simple extension function wrangler 2006-12-15 09:30:31 -07:00
Brian
39adc30250 change/add/rm several filenames 2006-12-15 08:55:49 -07:00
Brian
c968d3d410 Renamed s_nvfragprog.[ch] to s_fragprog.[ch] 2006-12-15 08:50:02 -07:00
Brian
b78fb7abaf Renamed s_nvfragprog.[ch] to s_fragprog.[ch], program_instruction.h to prog_instruction.h 2006-12-15 08:49:27 -07:00
Brian
6232438acb remove unneeded includes 2006-12-14 15:54:01 -07:00
Brian
885afd59ec remove unneeded includes 2006-12-14 15:53:49 -07:00
Brian
2c1f975852 remove unneded includes 2006-12-14 15:50:34 -07:00
Brian
901c1bb402 remove some unneeded includes 2006-12-14 15:49:09 -07:00
Brian
0831ef5038 include prog_print.h 2006-12-14 15:47:54 -07:00
Brian
cc6a141dc1 Remove some moved extern decls. 2006-12-14 15:47:34 -07:00
Brian
464b82b1e6 Move some code from prog_print.c to prog_instruction.c 2006-12-14 15:47:08 -07:00
Brian
0ae7404835 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2006-12-14 15:20:15 -07:00
Brian
865f88afc0 Renamed from s_nvfragprog.[ch] 2006-12-14 15:14:14 -07:00
Brian
49f82803cc Updated includes. 2006-12-14 15:13:06 -07:00
Brian
60417b646d chmod a-x 2006-12-14 15:03:33 -07:00
Brian
57d9531cd6 Updated includes. 2006-12-14 15:03:04 -07:00
Brian
c0551f0a46 Updated includes. 2006-12-14 15:02:37 -07:00
Brian
a7a89e362b Updated #includes after splitting program.h 2006-12-14 15:02:19 -07:00
Brian
0560d81ce9 Move many functions into new files. 2006-12-14 15:01:28 -07:00
Brian
00cdc0a472 Split the program.[ch] files into several new files. 2006-12-14 15:01:06 -07:00
Brian
5cc1292508 Replace __extension__ with LONGSTRING. 2006-12-14 14:27:05 -07:00
Brian
200736ebd8 Modify _mesa_strdup() so it handles NULL correctly. 2006-12-14 13:59:53 -07:00
Brian
cc0c8b2248 Updates for new linker (merged varying/uniform vars). 2006-12-14 13:59:25 -07:00
Brian
ef264c2971 Assorted fix-ups for the new linker.
Disable some of the excessive debug output.
2006-12-14 13:58:57 -07:00
Brian
d4f7e4cc01 The new linker actually does a few things right now:
The varying vars used by the vertex and fragment shader are merged so they
agree.
Similarly, uniforms are merged (along with constants, etc).
The vertex/fragment program instructions are then cloned and rewritten
with the newly resolved uniform/varying locations.
2006-12-14 13:58:32 -07:00
Brian
b2a3a8554a New functions for cloning programs and parameter lists. 2006-12-14 13:56:58 -07:00
Brian
e7e4181361 Remove include of s_arbshader.h 2006-12-14 09:51:54 -07:00
Brian
b56a5261fe Check in a long-misplaced spec update. 2006-12-14 09:38:06 -07:00
Michel Dänzer
fde908444a Fix copy-and-paste-o of my e-mail address. 2006-12-14 12:57:59 +01:00
Michel Dänzer
e0c9361a7c Avoid failing assertion in intel_miptree_set_image_offset() with cube maps.
Cube maps still aren't working quite correctly though.
2006-12-14 12:47:44 +01:00
Michel Dänzer
81855f22cd Fix some corner cases in i945_miptree_layout_2d().
Based on a patch from Keith Whitwell, with some further fixes.
2006-12-14 12:42:51 +01:00
Michel Dänzer
3416ef303a Share code to lay out >= 945 style 2D mipmaps between i915tex and i965 drivers.
Use the i965 version as it has some fixes over the i915tex version.
2006-12-14 12:39:38 +01:00
Michel Dänzer
cc1afed671 intel_finalize_mipmap_tree: Add more conditions for rebuilding mipmap trees.
These are taken from the i965 driver and fix corruption of some mipmap levels
under some circumsances with 945 chipsets at least.

Also flush the batchbuffer after copying data between trees, or some apps fail
an assertion elsewhere.
2006-12-14 11:04:10 +01:00
Michel Dänzer
5f8a3e586f intel_batchbuffer_flush: Don't assert cliprects when lock is not held.
This is a legitimate situation when copying texture data between mipmap trees.
2006-12-14 11:01:39 +01:00
Michel Dänzer
4cb09df015 intelTexSubimage: Fix last parameter for intel_miptree_image_map(). 2006-12-14 11:01:38 +01:00
Michel Dänzer
9c09259b8b _mesa_swizzle_ubyte_image: Only use single swizzle_copy call when strides match.
This fixes texture data corruption with glTexSubimage (and probably glTexImage
under some circumstances) with the texstore swizzle path.
2006-12-14 11:01:38 +01:00
Michel Dänzer
78a6e05439 mipmap_limits: Fix display of current texture filtering mode. 2006-12-14 11:01:38 +01:00
Ben Skeggs
99878298da Improve SwapBuffers a bit. 2006-12-14 04:34:38 +00:00
Ben Skeggs
c95557f48b 0x4497 doesn't have NV30_TCL_PRIMITIVE_3D_NORMALIZE_ENABLE 2006-12-14 04:12:05 +00:00
Ben Skeggs
15c7e8896b Some more voodoo to get 3D going with a minimal initial context. 2006-12-14 03:24:57 +00:00
Brian
2a9950dcb3 Remove unneeded -I directories (3Dlabs headers). 2006-12-13 19:20:45 -07:00
Roland Scheidegger
2956a0c8a8 submit vertex weights to make World of Warcraft maybe happy (bug 8250)
submit the vertex weights to hw, which will enable broken vertex programs
errorneously using them to work. Note however that this will only work
if glWeight is used, there is no code in mesa at all to deal with weight
vertex array (glWeightPointerARB).
2006-12-14 00:34:44 +01:00
Brian
2cbfbcd972 Obsolete. 2006-12-13 15:38:07 -07:00
Brian
33ae886bbd Remove unused 3Dlabs code. 2006-12-13 15:36:26 -07:00
Brian
aed4f2cc2c Remove unused 3Dlabs code. 2006-12-13 15:36:00 -07:00
Brian
05dab5eaa2 Checkpoint GLSL compiler work. Add new sources, remove obsolete. 2006-12-13 15:34:10 -07:00
Brian
1fbb1c8d78 Obsolete. 2006-12-13 15:33:41 -07:00
Brian
a5011d9753 Not needed. 2006-12-13 15:33:09 -07:00
Brian
8dcfcad7a2 Move all the code for computing ctx->_TriangleCaps into state.c.
ctx->_TriangleCaps should probably go away altogether someday...
2006-12-13 15:31:14 -07:00
Brian
cefc983bec Retire old GLSL shader code. 2006-12-13 15:06:28 -07:00
Brian
12ef1fbefc Checkpoint for GLSL compiler changes.
In brief:
Check for enabled fragment program by looking at ctx->FragmentProgram._Current.
New code for varying variables.
2006-12-13 15:05:23 -07:00
Brian
a328e469d3 Checkpoint work for new GLSL compiler back-end.
Among changes:
Remove ctx->FragmentProgram._Active
Remove _UseTexEnvProgram
Move _MaintainTnlProgram, _MaintainTexEnvProgram, _TexEnvProgram and
_TnlProgram fields.
Remove/disable old GLSL interpreter code.
2006-12-13 14:58:13 -07:00
Brian
fe1d01cb39 Checkpoint of work for new GLSL compiler back-end. Lots of assorted changes. 2006-12-13 14:54:47 -07:00
Brian
8627bf1452 Rewrite/simplify most built-in functions to use updated set of __asm instructions. 2006-12-13 14:49:41 -07:00
Brian
aff8e204d2 Checkpoint new GLSL compiler back-end to produce fp/vp-style assembly instructions. 2006-12-13 14:48:36 -07:00
Brian
6c305c0831 Remove the xdemo.c program from PROGS since it doesn't work with GLX/DRI. 2006-12-13 08:57:06 -07:00
Brian
73eee2402e Use XDisplayName() when reporting errors (bug 8079). 2006-12-13 08:30:26 -07:00
George Sapountzis
5b35132b41 Bug 7260: mach64 texture memory mng cleanup
mach64 uses its own set of texture memory management routines which are buggy,
running a second DRI client kills the first one. This patch ports mach64 code
to the stock dri texture managment code.
2006-12-12 12:51:37 +02:00
George Sapountzis
c180678d92 Bug 7861: mach64 with render acceleration should restore texture state
RENDER acceleration uses texturing, thus when RENDER acceleration is enabled,
the mach64 DRI driver should restore texture state when acquiring the DRI lock.
2006-12-12 12:51:33 +02:00
George Sapountzis
eed1a6de4b Bug 7790: Polygons incorrectly clipped by mach64 driver
un-break strict-aliasing rules
2006-12-12 12:51:27 +02:00
Michel Dänzer
26626c0052 minstall: Pass correct destination file path to $RM regardless of source path. 2006-12-11 17:45:06 +01:00
Michel Dänzer
d71a5647a3 minstall: Always remove destination file before (re-)creating it.
This avoids issues with overwriting files that are being used.
2006-12-11 17:36:35 +01:00
Eric Anholt
d7b24fec24 i965: Fix a crash with wine by not allocating >1MB on the stack. 2006-12-09 22:35:07 -08:00
Patrice Mandin
aadcf1a9ff Update spot light params also for nv20 and nv30 2006-12-08 18:56:51 +00:00
Patrice Mandin
5c80270b91 grr, always check twice before commit 2006-12-08 16:40:34 +00:00
Patrice Mandin
65c54a685a Resend spot light parameters when part of it changes 2006-12-08 16:39:12 +00:00
Ben Skeggs
c04c74bc5d Skeletal extension handling across chipsets. 2006-12-08 14:12:47 +00:00
Ben Skeggs
fe91d00e33 NV_44 uses nv30InitStateFuncs too 2006-12-08 12:36:26 +00:00
Ben Skeggs
046ece3a2d state cache is automagically flushed on a normal BEGIN_RING_SIZE 2006-12-08 11:51:50 +00:00
Ben Skeggs
e62b2f9c2e Implement a simple nv30Clear, and make sure we get a nouveau_renderbuffer
for the depth buffer and not a Mesa renderbuffer adaptor
2006-12-08 11:45:39 +00:00
Xiang, Haihao
f79360858d fix bug#9237 2006-12-08 17:05:14 +08:00
Xiang, Haihao
5449f5a975 fix bug#9045 2006-12-08 17:00:59 +08:00
Ben Skeggs
bda66ac426 oops, typo 2006-12-08 07:27:39 +00:00
Ben Skeggs
011377622f Create visuals for modes the ddx provides 2006-12-08 07:15:43 +00:00
Ben Skeggs
1d6f13986c oops, we don't want this by default just yet... 2006-12-08 03:04:10 +00:00
Ben Skeggs
4cfb762c3e Some work on buffer handling, most likely not entirely correct and
incomplete. But, it works well enough that windows can be
    moved/resized.
2006-12-08 03:01:33 +00:00
Michel Dänzer
7a10d66590 i915tex: Recalculate viewport related hardware state in intelWindowMoved().
This fixes vertically displaced rendering with some apps like Google Earth.

Simplify other parts of the function somewhat.
2006-12-07 11:03:48 +01:00
Michel Dänzer
94136651c3 Make git ignore Emacs backup files. 2006-12-06 18:39:05 +01:00
Brian
fcc54b5d34 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2006-12-06 08:20:57 -07:00
Brian
7f82674a7e Updated with new mesa-commit list. 2006-12-06 08:20:03 -07:00
Michel Dänzer
75e4cfd997 Make git ignore some more generated files. 2006-12-06 15:14:43 +01:00
Michel Dänzer
b46e359f58 glxinfo: When direct rendering is not enabled, print some hints.
If indirect rendering is forced, say how. Otherwise, suggest setting
LIBGL_DEBUG=verbose.

Inspired by http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=379323 .
2006-12-06 14:54:43 +01:00
Michel Dänzer
14f92636b0 Make git ignore files only generated at build time. 2006-12-06 14:17:56 +01:00
Michel Dänzer
7daf301046 Re-generate options.h with Swedish translations. 2006-12-06 14:06:52 +01:00
Daniel Nylander
e8c5e0f0b4 Swedish translation of driconf options. 2006-12-06 13:21:02 +01:00
Brian
eb9033c723 Replaced by .html file. 2006-12-05 16:36:35 -07:00
Brian
4a1976b224 Replaced by .html files. 2006-12-05 16:36:12 -07:00
Brian
492e406fec Removed/obsolete. 2006-12-05 16:27:31 -07:00
Brian
d43ccf61c2 New git repository info, links. 2006-12-05 16:14:39 -07:00
Brian
464e36391f New info about Mesa's git repository. 2006-12-05 16:14:14 -07:00
Stephane Marchesin
3867bc9780 Fix the swtcl module. 2006-12-03 11:46:18 +00:00
Patrice Mandin
f95fe81fff Remove duplicate nv10 tcl defines 2006-12-03 10:08:04 +00:00
Stephane Marchesin
d88d895e5a Merge the pciid work. Use lock step versioning with the drm. 2006-12-03 09:08:26 +00:00
Ben Skeggs
b4dcb99cbc Fix a copy+paste'o that caused some *very* strange bugs.. 2006-12-03 02:01:49 +00:00
Brian Paul
45b211f9d4 version bump 2006-12-02 19:26:01 +00:00
Brian Paul
4f3ff14a06 md5 sums 2006-12-02 19:22:16 +00:00
Brian Paul
eb667b979b remove directfbgl.h file 2006-12-02 18:20:53 +00:00
Brian Paul
b98c1e4a4b remove bogus link 2006-12-02 18:18:55 +00:00
Brian Paul
f10acf8b78 6.5.2 release updates 2006-12-02 18:18:41 +00:00
Gary Wong
50a81669ba Add i915tex and i965. 2006-12-02 02:20:05 +00:00
Gary Wong
7a43a6b4ff Structure CopyPixels similarly to i915 do_texture_copypixels, to ease future unification. 2006-12-02 01:13:06 +00:00
Claudio Ciccani
e99d6746ed Be aware that the surface storage can change between locks. 2006-12-01 20:58:26 +00:00
Claudio Ciccani
73fdecca9f Remove DirectFBGL header from Mesa bacause since 1.0.0 DirectFB installs its own header.
Updated to the current DirectFBGL interface (i.e. added GetProcAddress()).
2006-12-01 14:12:05 +00:00
Thomas Hellström
682393944c Fix an infinite loop error that may occur when many contexts are bound
to the same drawable in a multithreading environment. This one slipped out
of the texman merge.
2006-12-01 12:41:43 +00:00
Claudio Ciccani
40dc5902d3 Fixed compilation errors/warnings.
Duplicate destination surface to avoid saving/restoring the rendering state during each Clear.
2006-12-01 11:42:58 +00:00
Sean D'Epagnier
10cbd089ae the following improvements to linux-fbdev:
1. updated makefiles to build libOSMesa as well as libGL

these are improvements to fbdev-glut
1. mouse cursor will timeout and be invisible if not being used
2. do not restore colormaps to truecolor targets, this causes problems at
   exit on my g450
3. fixed a crash when cleaning up from failure by munmaping what had not
   yet been mmaped
4. Resize event handling is improved, the resize function is not invoked
   from a signal handler now.
5. The main loop can detect if it is running very fast (greater than 2khz)
6. keyboard up and special up events are generated from stdin input mode
   and if it is also not redrawing, it sleeps
7. corrections in escape sequences for function keys for stdin input
2006-11-30 03:25:28 +00:00
Roland Scheidegger
21cf414489 fix mixed conventional / generic vertex arrays which caused a wrong array order leading to very bogus rendering (for instance WoW intro screen mentioned in #8250). 2006-11-30 00:52:54 +00:00
Roland Scheidegger
e731d8aafa check for target instead of program->Target in _tnl_program_string, avoids segfault if program is NULL 2006-11-29 22:16:16 +00:00
Roland Scheidegger
ac8620f375 fix a bug in the sanity code when outputting vertex progs 2006-11-29 19:18:50 +00:00
Roland Scheidegger
5785e328e0 call Driver.ProgramStringNotify if a ati_fragment_shader changes and pick up the change in the r200 driver accordingly. 2006-11-29 16:41:28 +00:00
Eric Anholt
3cd06cf8c5 Add accelerated CopyPixels for non-overlapping, 1:1 blits.
Submitted by Gary Wong <gtw@gnu.org>
2006-11-29 01:16:12 +00:00
Brian Paul
716091a6a0 indent, comments, etc 2006-11-28 15:46:50 +00:00
Dave Airlie
c058f69daa add support to miniglx for updating drawables ..
requires hacks to DRM to remove MASTER from UPDATE_DRAW and ADD_DRAW
2006-11-28 04:50:54 +00:00
Dave Airlie
4a6f47c23b Update miniglx support for new memory manager 2006-11-28 04:50:07 +00:00
Brian Paul
d9a8cc430d comments 2006-11-27 17:48:59 +00:00
Brian Paul
c0815bc01f remove assertions to match i915tex code (bug 8726) 2006-11-27 17:40:07 +00:00
Brian Paul
744c3a367b get rid of meaningless XFree86LOADER test (bug 9144) 2006-11-27 16:50:10 +00:00
Brian Paul
3e6ef125f0 replace check for XFree86LOADER and IN_MODULE with XFree86Server (bug 9144) 2006-11-27 16:33:43 +00:00
Ben Skeggs
98818f159b - Add InitInstruction to hw shader backend, and remove SetUnusedSource.
- NV30FP/NV40VP: Clear any fields before we OR new values into them
- NV40VP: It seems that it might be possible to write a result reg at the
    same time a temp is written. In InitInstruction, initialise OUT_DEST to
    OUT_DEST_TEMP so result regs don't get clobbered by default.
2006-11-27 01:57:37 +00:00
Ben Skeggs
2f411b0a8b Fix RSQ emulation 2006-11-26 13:18:41 +00:00
Ben Skeggs
6ff3d2577e Fix progs/fp/tri-xpd
Fragprog consts are inlined, so make sure we update *all* occurances of a
    param :)
2006-11-26 10:19:44 +00:00
Tilman Sauerbeck
85365e6aa4 Bug #6044: actually delete the texture object in mgaDeleteTexture 2006-11-26 09:39:21 +00:00
Ben Skeggs
9c9e6abbf8 Incomplete shader stuff, should mostly work for NV40. Other cards, not so
much..
2006-11-25 09:58:35 +00:00
Ben Skeggs
902b26a0d6 fix scissor 2006-11-25 06:02:10 +00:00
Patrice Mandin
2911551727 nv10,nv20,nv30: send correct values for spot light direction X,Y,Z and
cutoff parameter C
2006-11-24 23:34:03 +00:00
Patrice Mandin
78e5f414cb nv10: rename spot light coefs like nv20,nv30 2006-11-24 23:23:18 +00:00
Brian Paul
16e7ca9d72 call slang_variable_construct() inside slang_variable_scope_grow() 2006-11-24 19:21:42 +00:00
Brian Paul
e49d06e619 new slang_variable_scope_grow() function 2006-11-24 19:01:14 +00:00
Brian Paul
d4c4bdfa1e const correctness, clean-ups 2006-11-23 16:56:55 +00:00
Brian Paul
f6ed86a1a5 indent 2006-11-23 16:52:18 +00:00
Brian Paul
308b85f29f fix several program-related bugs (bug 9136) 2006-11-23 15:58:30 +00:00
Keith Whitwell
897b9c5cb2 Haihao Xiang's edgeflag patch. 2006-11-23 10:13:22 +00:00
Keith Whitwell
c4649208f0 Haihao Xiang's pointsize initialization patch. 2006-11-23 10:12:05 +00:00
Stephane Marchesin
0faf23c26a That was really stupid. 2006-11-23 09:21:44 +00:00
Dave Airlie
50b3f5654e realign some of the i830 code from the i915 2006-11-23 01:12:41 +00:00
Brian Paul
17e97ea869 fix typo 2006-11-23 00:44:14 +00:00
Brian Paul
ba02b07c75 fix indirect glMap* bugs 2006-11-23 00:43:23 +00:00
Brian Paul
14c427573e s/ource/source/ 2006-11-23 00:42:25 +00:00
Brian Paul
d426c13e46 move comments 2006-11-23 00:41:44 +00:00
Brian Paul
dfc98c0bec indent 2006-11-23 00:38:50 +00:00
Dave Airlie
d98e1f3761 fixup draw/depth region handling in i830 along lines of i915 2006-11-23 00:09:16 +00:00
Brian Paul
6ab6518735 clean-up, comments 2006-11-23 00:09:00 +00:00
Brian Paul
0cb0a04eca indent 2006-11-22 23:58:47 +00:00
Roland Scheidegger
46e454863e decrease the current vertex count by 1 if an uneven number of vertices is copied by _tnl_copy_vertices. Otherwise, since in this case it will copy an extra vertex to avoid problems with vertex order in the new buffer, one triangle will be drawn twice. This fixes bug #9062. 2006-11-22 22:07:35 +00:00
Brian Paul
40c7cb7e17 const correctness 2006-11-22 21:59:28 +00:00
Brian Paul
98ea0a3f1f new comments 2006-11-22 21:49:14 +00:00
Brian Paul
f9f4625367 clean-up, comments 2006-11-22 21:34:47 +00:00
Brian Paul
958a8af3b0 reindent 2006-11-22 21:34:30 +00:00
Brian Paul
982ceb6773 fix comments 2006-11-22 21:33:44 +00:00
Ben Skeggs
7398748add Some missing state init 2006-11-22 20:15:56 +00:00
Roland Scheidegger
22b74ff2b7 fix the gl version test 2006-11-22 19:37:21 +00:00
Ian Romanick
b0d8b13777 Add tdfx updates to release notes. 2006-11-22 19:05:20 +00:00
Roland Scheidegger
7f9afedeb5 remove unneded call to _tnl_invalidate_state() in _tnl_need_projected_coords(). Connected to bug #9103, though that bug got fixed without this change too. 2006-11-22 17:54:31 +00:00
Brian Paul
9540c9c04f GLX protocol fixes for glMap* functions (bug 8899) 2006-11-22 16:01:48 +00:00
Keith Whitwell
96c0a6de25 Prune incoming state to the atoms of interest. Hopefully this will
prevent driver-initiated statechanges in the middle of
DrawElements/DrawArrays from disturbing this code.
2006-11-22 15:27:58 +00:00
Keith Whitwell
b72fbcbe63 Another fix 2006-11-22 13:53:21 +00:00
Keith Whitwell
96228d952d Set _NEW_LIGHT when materials are present in display lists also. 2006-11-22 09:35:19 +00:00
Keith Whitwell
c8238aa0ff Move setting of _NEW_LIGHT to only occur when materials are present. 2006-11-22 09:34:55 +00:00
Roland Scheidegger
49a3ea8110 fix segfault with ATI_fs when trying to use a not enabled texture unit (bug #9110). 2006-11-21 23:37:21 +00:00
Patrice Mandin
3e4a5c0642 Enable nv10 tcl state 2006-11-21 21:44:16 +00:00
Patrice Mandin
ac09b567a8 nv10,nv20: nvX0ShadeModel static function 2006-11-21 21:15:49 +00:00
Patrice Mandin
677666eb70 nv10,nv20,nv30: color light components renamed from a,b,c to r,g,b 2006-11-21 21:11:58 +00:00
Patrice Mandin
81ae0bd249 ah, correct revision now 2006-11-21 20:38:14 +00:00
Patrice Mandin
4ed78e20a4 update from renouveau 2006-11-21 20:29:09 +00:00
Patrice Mandin
b5e800068b nv10: update state 2006-11-21 19:56:15 +00:00
Brian Paul
8f008056b2 list header files in sources files (Dan Nicholson) 2006-11-21 16:04:22 +00:00
Keith Whitwell
f332da515c blend, logicop changes for intelEmitCopyBlit backported to i915 2006-11-21 14:43:30 +00:00
Ben Skeggs
a75440bcf0 nouveauCreateDmaObject 2006-11-21 14:03:06 +00:00
Keith Whitwell
b1c102d37b More fixes, glean seems to run now. 2006-11-21 13:22:34 +00:00
Stephane Marchesin
fb65450704 Remaining state cache changes 2006-11-21 13:07:48 +00:00
Stephane Marchesin
0ea45b1ad8 Add the state caching mechanism. It seems to work, from what I can see. 2006-11-21 12:43:16 +00:00
Alan Hourihane
33d2835182 Don't define as const's to avoid compiler optimization & warning. 2006-11-21 10:59:31 +00:00
Keith Whitwell
64920ed10a Fix more typos. 2006-11-21 10:50:01 +00:00
Keith Whitwell
46c04525d2 Gary Wong's patches for CopyPixels Logiop (enable) and Blend
(disallow).  Slightly cleaned to disallow on all blend states for code
consiseness and turn a table lookup into a function to match other
code in the driver.
2006-11-21 10:43:16 +00:00
Keith Whitwell
f58ec215c5 Gary Wong's fix for 64 bit cleanness of vertex program inputs bitmask. 2006-11-21 10:16:37 +00:00
Keith Whitwell
d6f89107ba Commit Gary Wong & Keith Packard's changes for bug 8867 -- adjust code
after repositioning of INDEX value in BRW_ATTRIB enum.
2006-11-21 10:11:02 +00:00
Sean D'Epagnier
0570fcfd93 Added correct include files to files,
No longer modify cmap if the device is truecolor (messes up dual monitors
	with vt switching)
2006-11-21 09:35:49 +00:00
Sean D'Epagnier
0337e5635f glTexCoord3dv was not using third coordinate 2006-11-21 08:48:44 +00:00
Jeremy Kolb
a20cf73053 More state. 2006-11-21 02:47:13 +00:00
Rune Petersen
25e495d605 Disable fragment program debug messages. 2006-11-20 19:57:10 +00:00
Jeremy Kolb
afb49fef90 Add state initialization to context creation. 2006-11-20 17:25:54 +00:00
Brian Paul
b24320bb30 added new 'sources' file to tarball (might not get used though) 2006-11-20 17:09:04 +00:00
Keith Whitwell
479aca6bf1 Fix typos that meant vbos were never unmapped 2006-11-20 15:15:24 +00:00
Brian Paul
7cc5522f86 fix glPopAttrib/color material bug #9091 2006-11-20 15:14:35 +00:00
Jouk Jansen
d2fc1c8384 Committing in .
Solve small definition problem for OpenVMS

 Modified Files:
 	Mesa/src/mesa/shader/descrip.mms
2006-11-20 14:04:04 +00:00
Keith Whitwell
dd60eaa6d9 Don't perform dangling attribute check on POS attribute. It can't by
definition dangle (every vertex has a position).  However
save->currentsz isn't properly maintained for this attribute, as there
is no current position value to track.  Based on patch from Haihao Xiang.
2006-11-20 11:49:58 +00:00
Keith Whitwell
87f602dd82 Don't perform dangling attribute check on POS attribute. It can't by
definition dangle (every vertex has a position).  However
save->currentsz isn't properly maintained for this attribute, as there
is no current position value to track.  Reported by Haihao Xiang.
2006-11-20 11:45:34 +00:00
Stephane Marchesin
50c85daf02 Cleanup the swtcl code. 2006-11-19 23:47:24 +00:00
Stephane Marchesin
ac208c95cd Use NONINC_METHOD for vertex data. 2006-11-19 23:39:16 +00:00
Stephane Marchesin
4165a10972 More work on the swtcl 2006-11-19 23:16:29 +00:00
Stephane Marchesin
fe2e6100ec More fifo debug fixes 2006-11-19 22:16:54 +00:00
Stephane Marchesin
a8d34992ea Oops. 2006-11-19 21:51:28 +00:00
Stephane Marchesin
3613eba085 Fix the fifo debugging feature. 2006-11-19 21:29:41 +00:00
Stephane Marchesin
327e2c9220 New swtcl implementation. It's simpler than the previous one (doesn't use
templates) and it is probably faster as well
2006-11-19 20:18:45 +00:00
Ben Skeggs
a7139168d2 Don't bother touching lighting stuff if shaders are in use 2006-11-19 16:05:59 +00:00
Ben Skeggs
80a0ce37df Fix nv30LineWidth, hw expects a ubyte. 2006-11-19 15:52:18 +00:00
Ben Skeggs
a2a747704d Avoid sharing subchannels with the ddx until context switching is done
properly..
2006-11-19 15:46:31 +00:00
Ben Skeggs
b3fd1556f9 More FIFO fixes. 2006-11-19 15:45:36 +00:00
Ben Skeggs
08a0946fcc Stupid bug.. 2006-11-19 14:10:54 +00:00
Ben Skeggs
82d0fd26d4 poke the correct FIFO regs 2006-11-19 12:00:59 +00:00
Brian Paul
2164cf7730 move fix-up code into new slang_fixup_save() function 2006-11-18 17:45:01 +00:00
Brian Paul
4d4373bb0f delete shader objects when destroying shared context state 2006-11-18 17:44:28 +00:00
Brian Paul
a89e063149 comments 2006-11-18 17:23:30 +00:00
Brian Paul
61068ba46b reindent 2006-11-18 17:22:44 +00:00
Brian Paul
63c119f771 additional fixes for mipmap building (Greg McGarragh) 2006-11-18 16:58:14 +00:00
Brian Paul
c478f0d25b name mangling update/fix 2006-11-18 16:44:30 +00:00
Brian Paul
bdb1c3882f need to specify Xlibs with APP_LIB_DEPS 2006-11-18 16:43:13 +00:00
Brian Paul
1e04ff1741 fix mgl name mangling problem 2006-11-18 16:40:09 +00:00
Stephane Marchesin
ae9c633a21 More state functions 2006-11-18 00:36:22 +00:00
Stephane Marchesin
e722e3480f Add nv20_state.c ; hook nv10_state.c into the build ; do the renaming
required by the renouveau changes.
2006-11-18 00:19:22 +00:00
Stephane Marchesin
8532b6e0a5 Small unneeded nv03 fix 2006-11-17 22:11:13 +00:00
Ben Skeggs
08020927e8 Use RENDERINPUTS macros to access render_inputs_bitset 2006-11-17 21:58:02 +00:00
Rune Petersen
6c9cc81601 fragment.position support
World position is calculated in the vertex shader and passed to the
fragment shader via an unused texcoord.
2006-11-17 19:12:42 +00:00
Rune Petersen
0f614df797 r300_select_vertex_shader4:
Makes the vertex program output from the fragment input.
It makes the driver capable of catching output-input mismatches safely. Primarily
based on some of Aapo Tahkola's code.
2006-11-17 19:08:05 +00:00
Brian Paul
08d64dfbf6 reindent, doxygen-style comments 2006-11-17 19:06:32 +00:00
Michal Krol
83f52ffc52 Comment and indent the atom functions. 2006-11-17 18:55:34 +00:00
Brian Paul
c15f6a991d gluBuild2DMipmaps() fixes 2006-11-17 15:59:19 +00:00
Brian Paul
8f28453987 fix some gluBuild2DMipmap bugs (Greg McGarragh) 2006-11-17 15:57:31 +00:00
Brian Paul
a4806c994e add STATE_INTERNAL_DRIVER, etc (Rune Petersen) 2006-11-17 15:23:32 +00:00
Ben Skeggs
10172f7485 Adapt FIFO code to deal with cases where the base GET/PUT value isn't 0. 2006-11-17 04:50:37 +00:00
Ben Skeggs
9daf0812a1 jkolb pointed out that face can also be FRONT_AND_BACK. Added stencil funcs 2006-11-16 23:43:39 +00:00
Brian Paul
7984c70070 revert prev check-in 2006-11-16 23:34:02 +00:00
Ben Skeggs
0da68e2e6e Add nv30InitStateFuncs 2006-11-16 23:24:20 +00:00
Brian Paul
523f5cfeb5 Add a lot of const qualifiers for const-correctness.
New comments, misc clean-ups.
2006-11-16 22:31:34 +00:00
Brian Paul
1f0c86ee35 reindent 2006-11-16 21:58:35 +00:00
Brian Paul
01a5a9afd8 remove unused imesa local var to silence warnings 2006-11-16 21:40:54 +00:00
Brian Paul
3dedeaa055 Initial implementation work for CAL, RET, and BRA instructions for fragment
programs.
2006-11-16 21:28:35 +00:00
Brian Paul
fa941e4267 disable yesterday's _mesa_add_named_constant() change for now 2006-11-16 20:59:11 +00:00
Brian Paul
cba90c17ad fix bug 9046 2006-11-16 20:58:26 +00:00
Patrice Mandin
9021df2d2a nv10 state copy/pasted from nv30 state 2006-11-16 19:50:56 +00:00
Brian Paul
f7436f4c8a regenerate from gl.h 2006-11-16 16:13:55 +00:00
Brian Paul
bb69d3af36 remove obsolete GL_MESA_trace stuff 2006-11-16 16:13:43 +00:00
Brian Paul
7438a78cf4 use LONGSTRING to silence warning 2006-11-16 16:12:10 +00:00
Brian Paul
ebe4c893f8 fix glDrawPixels(GL_COLOR_INDEX, GL_BITMAP) bug 9044 2006-11-16 14:44:23 +00:00
Keith Whitwell
b979479721 Make sure vbo's are mapped before accessing their contents in
api_arrayelt.c.  Reported by Haihao Xiang.
2006-11-16 02:33:38 +00:00
Brian Paul
82eeb62a31 reindent, clean-up 2006-11-16 00:58:44 +00:00
Brian Paul
0c6723aee5 Add a size parameter to _mesa_add_unnamed_constant() and
_mesa_add_named_constant() to indicate vector size (1, 2, 3 or 4).
Always 4 for now...
2006-11-15 23:38:02 +00:00
Brian Paul
699a33ea77 Add new _mesa_lookup_parameter_constant() to search for a GLfloat4 constant
in a parameter list.
Use it in _mesa_add_named_constant() and _mesa_add_unnamed_constant() to
avoid duplication of identical constants.
2006-11-15 23:19:52 +00:00
Brian Paul
408e01b939 reindent, add some comments 2006-11-15 21:52:20 +00:00
Brian Paul
4a12160e8f reindent 2006-11-15 21:41:24 +00:00
Brian Paul
adbbf94fa4 indent, comments 2006-11-15 21:39:57 +00:00
Brian Paul
2d376a61f0 s/int/GLboolean/ 2006-11-15 21:39:32 +00:00
Brian Paul
82a9ba92b4 improved error mesages 2006-11-15 21:38:26 +00:00
Brian Paul
7c279f4dd7 fix casts to silence warnings 2006-11-15 21:35:06 +00:00
Brian Paul
11a54c38f7 #define LONGSTRING __extension__ in imports.h and use it to silence gcc
warnings about long string literals.
2006-11-15 19:54:25 +00:00
Brian Paul
12e710c850 Comments for operations. 2006-11-15 18:56:48 +00:00
Jerome Glisse
8f6a50a49c Remove use of GetBufferSize (depreciated). 2006-11-15 17:45:05 +00:00
Brian Paul
222930461f more bug fixes 2006-11-15 14:59:05 +00:00
Keith Whitwell
6cc5a82206 Make sure RENDER_FINISH is called on the zero pixel case. Reported by
Haihao Xiang.
2006-11-14 14:22:43 +00:00
Ian Romanick
efa91b9a8f Enable GLX_SGI_make_current_read for tdfx.
Implement GLX_SGI_make_current_read for tdfx.  Remove annoying debug
printf in tdfxSwapBuffers.  Updated a comment in drirenderbuffer.h to
note that the tdfx driver uses a flag that was previously only used by
s3v.

This code was tested with glxgears, wincopy, and manywin.
2006-11-14 00:10:34 +00:00
Ian Romanick
0b69e4837e Clean-up compiler warnings. 2006-11-13 23:34:35 +00:00
Ian Romanick
37ce9b30e9 Implement GL_ARB_occlusion_query.
Based on the old code that implemented GL_HP_occlusion_test, implement
GL_ARB_occlusion_query.  This code passes progs/demo/arbocclude.
2006-11-13 22:54:43 +00:00
Ian Romanick
ce526de6ff tdfxDDWriteDepthPixels can be called with mask == NULL.
Via depth_test_pixels (swrast/s_depth.c), tdfxDDWriteDepthPixels can
be called with mask == NULL.  Test for this condition in the places
where mask might be dereference.  This matches the behavior of several
other functions in this file with a 'const GLubyte mask[]' parameter.
2006-11-13 22:51:11 +00:00
Ian Romanick
038bd400e2 Major clean-up of tdfxDDGetString. 2006-11-13 21:53:04 +00:00
Ian Romanick
7fbe6a5c51 Eliminate use of deprecated GetBufferSize interface. 2006-11-13 21:21:40 +00:00
Ian Romanick
e7ad10587a Fix "3D driver claims to not support visual ..." warnings.
In 16-bit color modes the 3D driver was erroneously creating fbconfigs
with 16-bits of accumulation alpha.  Since the 2D driver always
generates modes with zero bits of alpha, the lists of fbconfigs did
not match and warnings were generated by libGL.
2006-11-13 20:54:51 +00:00
Ben Skeggs
47695f0689 Fix segfault in nouveauCalcViewport 2006-11-13 16:01:03 +00:00
Jeremy Kolb
d5d00cf8c9 Add include guard. 2006-11-12 18:18:02 +00:00
Ben Skeggs
2af374716f Some more nouveau_screen.c setup, not sure how correct it is yet though.. 2006-11-12 08:38:44 +00:00
Ben Skeggs
b8e05366e1 We need nmesa->driFd and friends setup before we call nouveauFifoInit 2006-11-12 02:06:30 +00:00
Ben Skeggs
6464787bfd Dont call exit() from the DRI driver, with AIGLX this is particularly nasty 2006-11-12 02:05:40 +00:00
Ben Skeggs
d037c84c33 fix typo 2006-11-11 20:00:29 +00:00
Stephane Marchesin
f65a4b8a8d Some nouveau_screen work for darktama 2006-11-11 18:25:00 +00:00
Jeremy Kolb
4f61fd18b2 Fill in nv30PointSize and nv30Viewport. 2006-11-11 16:48:14 +00:00
Stephane Marchesin
994ea9556f Fix the texture init function name 2006-11-11 12:01:48 +00:00
Stephane Marchesin
0850289d8c Add the GL_LIGHING enable 2006-11-11 11:25:08 +00:00
Stephane Marchesin
f82bc9110b Some work on nv30 state, heavily based on jkolb's work 2006-11-11 00:00:45 +00:00
Ian Romanick
466d4a1dd0 Added information about added GLX_SGI_make_current_read support 2006-11-10 21:11:39 +00:00
Ian Romanick
ded5517bd5 Bump driver date. 2006-11-10 21:06:23 +00:00
Ian Romanick
5c38472152 Refactor savageXMesaSet{Back,Front}ClipRects.
Refactor savageXMesaSetBackClipRects and savageXMesaSetFrontClipRects
into a single new routine called savageXMesaSetClipRects.  This allows
a few cleanups in the code.
2006-11-10 18:57:30 +00:00
Ian Romanick
6e2c952537 Enable GLX_SGI_make_current_read.
Eliminate use of deprecated GetBufferSize interface.  Keep framebuffer
state associated with the read-drawable and the draw-drawable up to
date.

Tested with progs/demos/wincopy.
2006-11-10 18:47:22 +00:00
Brian Paul
0a3a1c6ae9 fix -noprefix option for Solaris (bug 7722) 2006-11-10 12:47:56 +00:00
Dave Airlie
2862316309 Fix up texture compression at least Get and TexImage, not too sure about
how to fix SubTexImage with compressed textures
2006-11-10 00:32:35 +00:00
Ian Romanick
d7815f5913 Implement GLX_SGI_make_current_read
Discontinue use of the old GetBuffeSize interface.  Track both the
current read-drawable and the current draw-drawable.  After moving
some context state to via_rednerbuffer, GLX_SGI_make_current_read can
be enabled.

The extension works, but the wincopy test prodcues a black window for
the destination window.  After messing around with the window and
looking at the code, I believe the problem is in the handling of
buffer swap requests on a drawable that isn't the current draw-drawable.
2006-11-10 00:14:30 +00:00
Ian Romanick
3ce4adaa8f Remove unnecessary setting of GetBufferSize to NULL. 2006-11-09 22:28:09 +00:00
Adam Jackson
c6f1d4c3a0 Fix some && (logical) that should clearly have been & (bitwise). 2006-11-09 20:47:22 +00:00
Dave Airlie
4bb39f5899 remove drm stuff from libGL, this is now in libdrm 2.3.0 2006-11-08 22:25:52 +00:00
Stephane Marchesin
20802a7b69 Commit a small nitpick 2006-11-07 17:37:22 +00:00
Roland Scheidegger
0ddd50c8ae fix vp lockups due to incorrectly set up / emitted attrib inputs. 2006-11-05 23:13:19 +00:00
Roland Scheidegger
aee30f3f9d fix using VERT_ATTRIB_WEIGHT instead of VERT_BIT_WEIGHT when assigning vp inputs. 2006-11-05 22:21:11 +00:00
Brian Paul
831d13bc42 reindent 2006-11-05 15:30:41 +00:00
Stephane Marchesin
e2b4d9b317 Architect the DRI :
- make use of the autogenerated nouveau_reg.h file
- add object creation to the DRI
- some work on screen and context creation
2006-11-05 13:46:48 +00:00
Jerome Glisse
e330a69ee5 Add sin instruction to fragment program.
There is a bug somewhere in fragment program.
tri-cos and tri-sin show the bug. Also we
should not emit multiple time the same constant.
for sin,cos,lit have to fix that.
2006-11-05 00:47:27 +00:00
Jerome Glisse
0056ea5417 Add cos instruction and remove left over debug. 2006-11-04 23:50:27 +00:00
Brian Paul
120584a1e6 Fix for glGetVertexAttribfvNV, bug 8883 2006-11-04 17:31:45 +00:00
Brian Paul
adf3a64b03 fix error msg 2006-11-04 17:31:21 +00:00
Brian Paul
590b557b10 fix for glGetVertexAttribfvARB, bug 8883 2006-11-04 17:28:38 +00:00
Brian Paul
64d952c92c #define _glapi_Dispatch _mglapi_Dispatch when USE_MGL_NAMESPACE is set. 2006-11-03 23:43:14 +00:00
Brian Paul
c9365b7ca4 Fix _mesa_IsProgram() and _mesa_IsShader() 2006-11-03 23:32:30 +00:00
Brian Paul
2fbaddfa69 check for USE_MGL_NAMESPACE 2006-11-03 23:28:36 +00:00
Brian Paul
d2f80777e8 implement _mesa_GetShaderiv() 2006-11-03 22:23:47 +00:00
Brian Paul
3bef600024 implement _mesa_GetProgramiv() 2006-11-03 22:15:43 +00:00
Brian Paul
7e6701cef1 Simplify GET_CURRENT_LINKED_PROGRAM() macro and calling code. 2006-11-03 21:51:58 +00:00
Brian Paul
2659ee9dfb Use inlined uniform() helper function in all the glUniform*() function to
reduce duplicated code.
Finish up _program_ReadUniform() for non-float types.
Implement _mesa_GetUniformivARB().
Simplify the _program_WriteUniform() function a bit.
2006-11-03 21:30:16 +00:00
Brian Paul
c64a062918 plug in 2.0, 2.1 functions 2006-11-03 20:25:44 +00:00
Brian Paul
39cc8e8a06 Added OpenGL 2.1 entrypoints. 2006-11-03 20:20:28 +00:00
Brian Paul
33748aaad8 Set DO_DEBUG=0 2006-11-03 19:55:01 +00:00
Brian Paul
3c1ce571ed only enabled memcpy timing if DO_DEBUG=1 2006-11-03 19:54:40 +00:00
Brian Paul
d00ef005fe replace CONFIG_H with MESA_CONFIG_H_INCLUDED 2006-11-03 18:35:52 +00:00
Brian Paul
9e4a06a482 added 1.3/1.4 function mangling 2006-11-03 18:29:39 +00:00
Brian Paul
07bec141ac assorted updates for 6.5.2 2006-11-03 17:43:20 +00:00
Brian Paul
bdb251bcbf Added OpenGL 2.1 glUniformMatrix* functions.
Refactor the _mesa_UniformMatrix() functions to use a helper function.
Implement GetUniformfv function (might need more work someday).
2006-11-03 17:29:31 +00:00
Brian Paul
e90e827824 reformat comments in Doxygen style 2006-11-03 17:18:05 +00:00
Brian Paul
4d5744e66d reindent 2006-11-03 16:50:22 +00:00
Brian Paul
61fd687c74 Minor changes to get ready for OpenGL 2.1. 2006-11-03 15:18:17 +00:00
Keith Whitwell
188a4db49c Fix compiler warnings.
Add missing code for translating non-GLuint elements.
2006-11-03 13:04:08 +00:00
Roland Scheidegger
029d18cd3d enable generic arrays for r200 hw vertex programs by assigning unused color and texture inputs to them. Not widely tested yet. This should eliminate all fallbacks due to vertex programs, except writes to back facing colors, or when exceeding a hw limit (12 temps, 12 attribs etc.). 2006-11-03 12:48:18 +00:00
Roland Scheidegger
c3da1501b8 need to call bind_arrays() in vbo_exec_DrawRangeElements. 2006-11-03 12:33:29 +00:00
Roland Scheidegger
25b2e50229 remove remaining traces of r200FlushVertices... 2006-11-03 12:30:55 +00:00
Roland Scheidegger
e7b71f6919 remove setting some driver funcs explicitly to NULL, as they are no longer set up later. Thix fixes a segfault in _mesa_Bitmap(). 2006-11-03 02:07:34 +00:00
Brian Paul
4b43054c4b added fsligght 2006-11-03 00:16:12 +00:00
Brian Paul
24ea2c2cef yet another deriviative of the fplight.c demo for OpenGL 2.0 shading language 2006-11-03 00:04:06 +00:00
Brian Paul
83a5c2bf63 Update gl_API.xml with OpenGL 2.0 functions, regenerate derived files. 2006-11-02 23:58:27 +00:00
Brian Paul
7a28779b2e minor change in _mesa_ResizeBuffersMESA() 2006-11-02 23:56:08 +00:00
Brian Paul
fc69beecb6 include utils.h to silence warning 2006-11-02 23:43:22 +00:00
Brian Paul
ce55bbe9ef s/GLuint/int/ to silence warnings 2006-11-02 23:41:37 +00:00
Brian Paul
7941474a21 casting, type changes to silence warnings 2006-11-02 23:40:24 +00:00
Brian Paul
15193e78c9 s/GLint/GLuint/ to fix sign warnings 2006-11-02 23:34:02 +00:00
Brian Paul
071db86299 fix typo, silence warnings 2006-11-02 23:29:03 +00:00
Brian Paul
dd0830228b Fix GL_EXT_packed_depth_stencil crash, but shadowtex still broken 2006-11-02 23:16:18 +00:00
Brian Paul
05267501af comment about a valgrind error 2006-11-02 22:56:27 +00:00
Brian Paul
71f71c2c8a s/GLchan/GLubyte/ in debug code 2006-11-02 22:55:59 +00:00
Brian Paul
959571f835 init SecondaryRasterColor 2006-11-02 22:54:18 +00:00
Brian Paul
e441427f40 Added GL_STENCIL_BACK_WRITEMASK 2006-11-02 22:53:32 +00:00
Brian Paul
af864bb0da check for shader extensions for OpenGL 2.0 2006-11-02 22:40:43 +00:00
Brian Paul
e812081253 Undo some of yesterday's ATI_separate_stencil changes. The ATI extension
doesn't exactly match OpenGL 2.0.
2006-11-02 22:39:29 +00:00
Brian Paul
d78f65cd6c Fix fragment program fog problems found with Glean.
1. add PROGRAM_CONSTANT to switch() in src_vector().
2. use _mesa_append_fog_code() to handle fog options in i915ProgramStringNotify().
3. Re-enable some vertex attribute emit code that was previously disabled in i915ValidateFragmentProgram().
2006-11-02 21:43:06 +00:00
Brian Paul
67a101759e Call _mesa_problem() from i915_program_error() so we get a nice error message. 2006-11-02 21:39:20 +00:00
Jerome Glisse
a93f4a7310 Move r300 to new fbo interface based on Keith Whithwell.
Tested with progs/redbook/varray.
2006-11-02 20:44:03 +00:00
Jerome Glisse
b6c2a6a0f2 Add requested size to r300RefillCurrentDmaRegion.
This way we no longuer have the fixed RADEON_BUFFER_SIZE.
Anyway function calling AllocDmaRegion should check if this
succeed and fail gracefuly if not (see bug 8348).
2006-11-02 20:02:26 +00:00
Brian Paul
94249ca333 remove GetBufferSize = NULL; assignment 2006-11-02 19:23:41 +00:00
Brian Paul
df5edb21f8 Fixes Glean vertex/fragment test failures. Those tests never called
glViewport so the viewport was 0 by 0 pixels.
2006-11-02 19:18:09 +00:00
Brian Paul
c97bc619d6 remove GetBufferSize code 2006-11-02 19:16:08 +00:00
Keith Whitwell
7e9c3684ef Fix type-conversion of incoming vertices.
Fix mis-application of increment to pointer variable.
2006-11-02 19:11:16 +00:00
Keith Whitwell
01e238e5d5 Fix typo in last commit 2006-11-02 19:02:04 +00:00
Brian Paul
6f676f4871 always load frag prog state params for now (see comments) 2006-11-02 18:35:19 +00:00
Brian Paul
51b115d5ae remove unneeded extern declaration of lockMutex 2006-11-02 18:15:26 +00:00
Brian Paul
29ed894633 bump driver date 2006-11-02 18:13:40 +00:00
Keith Whitwell
301acdf34a Similarly, fill in missing input slots in the vertex-array +
NV_vertex_program path.
2006-11-02 18:02:17 +00:00
Keith Whitwell
5a652f5957 Fill in missing input slots in the vertex-array + no-vertex-program
path.
2006-11-02 18:00:43 +00:00
Brian Paul
7a9c7c1133 Use RGBA_LOGICOP_ENABLED() instead of ctx->Color._LogicOpEnabled since we often
need to check for this condition before the later field has been computed.
Fixes logicop bug #8860.
2006-11-02 17:51:04 +00:00
Brian Paul
abc73d9cba new RGBA_LOGICOP_ENABLED() macro 2006-11-02 17:49:47 +00:00
Brian Paul
12fe1b3a58 s/_mesa_IsProgram2/_mesa_IsProgram/ 2006-11-02 16:21:04 +00:00
Brian Paul
f49c0d0dfb Rename _mesa_IsProgram() to _mesa_IsProgramARB() to avoid collision with the
OpenGL 2.0 function of the same name.
2006-11-02 16:20:29 +00:00
Brian Paul
f961d394e3 OpenGL 2.0 entrypoints 2006-11-02 16:11:31 +00:00
Brian Paul
e71e4c9e47 run indent on the code 2006-11-02 16:09:10 +00:00
Brian Paul
036173e0d8 test OpenGL 2.0 stencil funcs 2006-11-02 15:47:30 +00:00
Alan Hourihane
6d104cb932 merge current trunk into vbo branch 2006-11-02 12:02:13 +00:00
Keith Whitwell
18d52f96bb Fix typo in display list attrib binding. 2006-11-02 11:40:56 +00:00
Keith Whitwell
9827dc8bea Respect array->Normalized flag.
Import edgeflag attribute to array of GLbooleans as expected by
downstream code.
2006-11-02 09:48:30 +00:00
Keith Whitwell
c22f8a7787 missing file 2006-11-02 08:37:17 +00:00
Brian Paul
467c773f79 Add ATI_separate_stencil and use it in preference to EXT_stencil_two_side
since the former is what's used for OpenGL 2.0.
2006-11-02 00:41:40 +00:00
Brian Paul
faba58c447 update _mesa_select_tex_image() and _mesa_get_tex_image() 2006-11-01 22:28:54 +00:00
Brian Paul
92c99bc51b update comments 2006-11-01 20:48:00 +00:00
Brian Paul
a5676795cf Remove x/y/width/height parameters from Clear functions. 2006-11-01 19:35:22 +00:00
Brian Paul
533e5a73ee comment-out unused var 2006-11-01 19:26:18 +00:00
Brian Paul
6a92324cf0 remove unused vars 2006-11-01 19:25:43 +00:00
Brian Paul
d972c86876 fix _mesa_select_tex_image() calls 2006-11-01 19:25:19 +00:00
Michal Krol
7d08e3a117 Write back gl_FragDepth to span->array->z. 2006-11-01 19:02:27 +00:00
Brian Paul
9669804fe4 Don't use the x/y/width/height params passed to Clear(). Get them
after locking.  Next: remove the params altogether.
2006-11-01 18:51:43 +00:00
Brian Paul
26b5904d70 disable debug printf 2006-11-01 18:49:41 +00:00
Brian Paul
4db0c89d25 disable debug printfs 2006-11-01 18:48:28 +00:00
Jerome Glisse
361d137587 Correct a little bug, radeon->glCtx is a pointer. 2006-11-01 16:21:14 +00:00
Jerome Glisse
8d87196c12 Remove deprecated GetBufferSize interface. 2006-11-01 16:18:08 +00:00
Brian Paul
351feae130 recent updates/fixes 2006-11-01 15:24:47 +00:00
Keith Whitwell
57f09b6e5e fix compiler warnings 2006-11-01 15:23:50 +00:00
Keith Whitwell
8665b828fe Patch from <haihao.xiang@intel.com> -- pass program string
notification callback through to tnl/ module, fixes glean crash.
2006-11-01 15:20:23 +00:00
Keith Whitwell
48e6fff3a9 merge the (rest of) texmem branch 2006-11-01 14:26:10 +00:00
Keith Whitwell
5ac93f8621 Merge texmem-0-3-branch. 2006-11-01 14:21:57 +00:00
Jerome Glisse
232a489b41 Add LIT instruction to fragment program. 2006-11-01 12:03:36 +00:00
Keith Whitwell
6b9e31f3eb Import texmem i915 driver to its new location as i915tex. 2006-11-01 12:03:11 +00:00
Jerome Glisse
3c6e99ce95 Add CMPH instruction to fragprog
CMPH a0, a1, a2 -> if a2 > 0.5 return a1 else return a0
Guessed by examinating LIT instruction handling of FGLRX.
2006-11-01 11:58:16 +00:00
Keith Whitwell
fd60b2d536 Patch from <haihao.xiang@intel.com> -- pass program string
notification callback through to tnl/ module, fixes glean crash.
2006-11-01 09:35:26 +00:00
Jeremy Kolb
1ebe921228 Added OUT_RING* debugging macros. Compile with NOUVEAU_RING_DEBUG to use. 2006-11-01 02:48:34 +00:00
Jeremy Kolb
2d2d617dbc Oops. Forgot to check in the context change. 2006-11-01 02:45:12 +00:00
Jeremy Kolb
2581ba7f1e Fix compile errors. Add vblank_seq to nouveau_context. 2006-11-01 02:44:27 +00:00
Brian Paul
d106195ad2 change DEBUG_FRAG conditions 2006-11-01 00:14:04 +00:00
Brian Paul
e6f47d1855 fix some bugs in interpolate_specular() 2006-11-01 00:13:16 +00:00
Brian Paul
90fcf6ccc3 Added a few new ctx->Const. fields for shader-related limits. 2006-11-01 00:12:41 +00:00
Brian Paul
5050b565de make use of Parameters->StateFlags in _swrast_update_fragment_program() 2006-10-31 19:53:38 +00:00
Brian Paul
ef987aa1d7 minor clean-ups, simplifications and new comments 2006-10-31 19:53:03 +00:00
Brian Paul
7e75f51b27 fix MINGW32 problems 2006-10-31 19:14:27 +00:00
Brian Paul
4e9e0aff79 We need to call _mesa_load_state_parameters() whenever a fragment program
is enabled and we've changed any GL state that might be referenced by a
fragment program (such as state.fog.params).  Do this during swrast
validation, not in _swrast_exec_fragment_program().
2006-10-31 16:02:56 +00:00
Brian Paul
72f49657e8 signal _NEW_LIGHT in _tnl_copy_to_current() 2006-10-31 16:01:11 +00:00
Brian Paul
ecd1743a0c In TEX instructions, use precomputed lambda only if using fragment.texcoord[k]
to sample texture[k].  Use zero otherwise.  Not foolproof, but a good
compromise.
2006-10-31 14:29:01 +00:00
Keith Whitwell
35ee4affc5 switch remaining drivers over to vbo 2006-10-31 12:12:15 +00:00
Keith Whitwell
851d15ef3a disable vtxfmt_a code, switch over to vbo 2006-10-31 12:11:56 +00:00
Keith Whitwell
80c88304fc remove vtxfmt code, switch over to vbo 2006-10-31 12:11:10 +00:00
Keith Whitwell
70dd0126bd pickup structs from vbo.h 2006-10-31 11:40:31 +00:00
Keith Whitwell
1f07439fe8 move public structure definitions to vbo.h 2006-10-31 11:39:57 +00:00
Keith Whitwell
f2eb6434ab cleanup code, compiles with vbo changes 2006-10-31 11:28:45 +00:00
Brian Paul
256c96136c For TEX instructions use lambda=0. When sampling from texture unit K we
were using the partial derivatives of texcoord[K] but the coordinate used
for texture sampling may be something totally different (and texcoord[K]
might not be a real texture coord at all).  Net result was a bogus LOD is
sometimes used, often resulting in using the smallest mipmap level (a
constant color).
Just use zero for now (undef LAMBDA_ZERO to override).
Plus, some additional debug code.
2006-10-31 01:22:38 +00:00
Ian Romanick
b14bae8466 Fix bug #8799.
Properly resize bith the drawable and the readable in mgaUpdateRects.
Eliminate the use of the deprecated GetBufferSize interface.  Bump
driver date.
2006-10-30 23:44:54 +00:00
Ian Romanick
86a465412d Refactor mgaXMesaSetFrontClipRects and mgaXMesaSetBackClipRects.
Combine mgaXMesaSetFrontClipRects and mgaXMesaSetBackClipRects into a
single new function called mga_set_cliprects.  This enables a small
refactor in mgaDDDrawBuffer.
2006-10-30 22:17:39 +00:00
Ian Romanick
5af5260f3c Get DRI drawable from framebuffer object.
In the software rasterization fallbacks, get the __DRIdrawablePrivate
pointer from the driRenderbuffer that is passed in.  This eliminates
the need for the mesa_drawable pointer in MGA context structure.

This partially fixes bug #8799.  wincopy no longer produces a black
window for the destination window, but it does produce incorrect
results if the destination window is resized.
2006-10-30 22:07:00 +00:00
Keith Whitwell
a1a8a2c024 oops, get.c is autogenerated 2006-10-30 20:29:13 +00:00
Keith Whitwell
fd2756006a Move edgeflag into the VERT_ATTRIB_SEVEN slot. This means that our
NV_vertex_program implementation has slightly incorrect aliasing
behaviour.  I think this is reasonable given the simplification and
the fact that the mainstream ARB_vp continues to have the correct
behaviour.
2006-10-30 20:16:35 +00:00
Keith Whitwell
e8abd098b3 Remove wakeup functions. This code is intended to be active all the
time.
2006-10-30 17:12:05 +00:00
Keith Whitwell
48f5deab94 switch several dri drivers over 2006-10-30 16:56:56 +00:00
Keith Whitwell
99efde461d better handling of current attributes. Trivial dlist and varray tests work 2006-10-30 16:44:13 +00:00
Keith Whitwell
efef291dc7 checkpoint - remove dead files, otherwise untested 2006-10-30 16:43:39 +00:00
Brian Paul
075fae5200 code tweaks, remove old comments 2006-10-30 00:22:28 +00:00
Brian Paul
0f8405365f fix _mesa_problem() text 2006-10-30 00:13:31 +00:00
Brian Paul
a23e668d40 Move gl_vertex_program_machine struct out of mtypes.h and put into nvvertexec.h.
Massage nvvertexec.c code to work more like s_nvfragprog.c - another step
toward unifying vertex/fragment program execution.
2006-10-30 00:12:05 +00:00
Brian Paul
0781339b39 remove debug code 2006-10-30 00:07:22 +00:00
Brian Paul
e998c34647 Rather than always allocating 100 instructions, put instructions into a
temporary buffer, then copy into a malloc'd array of the correct size.
According to Glean texCombine, we never need more than 21 instructions.
2006-10-29 21:17:18 +00:00
Brian Paul
ebcedd2d89 New _mesa_exec_vertex_state_program() function. Start of some re-org. 2006-10-29 18:33:14 +00:00
Brian Paul
abb1430c79 fix wrong inequality 2006-10-29 18:14:00 +00:00
Brian Paul
d6272e0617 Change _mesa_init_instruction() to initialize an array of instructions. 2006-10-29 18:03:16 +00:00
Brian Paul
efd95c1084 Program instructions are initialized before parsing so no need to set
Abs, NegateAbs, CondMask and CondSwizzle fields to defaults here.
CondMask was getting mis-set.  Removing the incorrect assignment improves
fragment program speed by 15%.
2006-10-29 17:55:16 +00:00
Keith Whitwell
a3c86828ed Fix compiler warning 2006-10-29 09:54:17 +00:00
Keith Whitwell
0a0fb5e0b3 switch over to vbo module 2006-10-29 09:52:36 +00:00
Keith Whitwell
72b68455eb remove this module 2006-10-29 09:48:36 +00:00
Keith Whitwell
b1f176039a Changes for new vbo-building module.
- Removed all the old immediate, array and display list code.
	- Remove references to the old array_cache module.
	- Added a _tnl_draw_prims() entrypoint.
	- Added a simplified data import facility for converting
non-floating point data as required.

Checkpoint commit - trivial/tri works.
2006-10-29 09:48:15 +00:00
Keith Whitwell
fd12b37dba Checkpoint of new vbo-building code. Currently builds regular arrays
rather than VBO's - VBOs are easy but need to look closer at the
driver interface.  The trivial/tri demo works.
2006-10-29 09:46:11 +00:00
Brian Paul
a90ab5290c Added PROGRAM_CONSTANT to get_register_pointer().
More DEBUG_FRAG code.
2006-10-28 23:10:17 +00:00
Brian Paul
8ed319796f special case END in _mesa_print_instruction() 2006-10-28 23:08:07 +00:00
Brian Paul
f5eea0cc7a Implement _mesa_append_fog_code() for fragment program fog options. 2006-10-28 17:14:47 +00:00
Brian Paul
db5529573f If DEBUG, check that all array indices really do fall in [start,end] in
the DrawRangeElements() call.  Warn the user if that's not true.
2006-10-26 20:54:28 +00:00
Roland Scheidegger
b55a0ab7ab remove code for inserting mvp transform into position-invariant vertex progs and instead use _mesa_insert_mvp_code(). 2006-10-26 12:09:07 +00:00
Brian Paul
fe457474d4 Previously, if a fragment program referenced fragment.fogcoord but the
program didn't use the ARB_fog_linear option, the fragment program's
fragment.fogcoord register wasn't loaded properly.
2006-10-25 23:10:14 +00:00
Roland Scheidegger
e9b923182e change some bogus comments regarding the base e exponential function used for fog in vertex programs. 2006-10-25 12:14:26 +00:00
Roland Scheidegger
fc606f7db9 fix (per-vertex) fog when using ARB_vp by incorporating fog factor computation into the vertex program (not yet fixed for swtnl). Simplify (and correct) the VTX_TCL_OUTPUT_VTXFMT handling when using vertex programs, turns out it's solely driven by the needs of the past-vertex stage of the pipeline, this should fix lockups with ill-specified applications using vertex programs (for instance applications enabling fog but not writing to fog coord output will now get (conformant) undefined results instead of lockups). 2006-10-24 22:37:51 +00:00
Ian Romanick
e4298b9492 Add missing call to glutInit. 2006-10-24 20:50:08 +00:00
Brian Paul
6340d6bf22 s/GLchan/GLubyte/ 2006-10-24 13:46:39 +00:00
Brian Paul
59e1f3ddd8 whitespace clean-up 2006-10-24 13:45:08 +00:00
Keith Whitwell
759facb4d8 Emit cliprects in the userspace driver as required, rather than
passing them to the kernel.  This works because all drawing commands
in the 965 driver are emitted with the lock held and the batchbuffer
is always flushed prior to releasing the lock.  This allows multiple
cliprects to be dealt with, without replaying entire batchbuffers and
redundantly re-emitting state.
2006-10-23 08:43:26 +00:00
Brian Paul
b9786cfaae assorted clean-ups 2006-10-22 23:21:45 +00:00
Brian Paul
49a5a09ada don't save color/z if fragment is killed 2006-10-22 22:58:42 +00:00
Brian Paul
73dd09fdd3 add minstall script to MAIN_FILES (bug 8720) 2006-10-22 22:37:30 +00:00
Brian Paul
a632128ffa minor tweaks good for about 12% faster execution 2006-10-22 22:36:24 +00:00
Brian Paul
ec9bbac7c7 silence used var warnings 2006-10-22 22:25:46 +00:00
Brian Paul
0b26e826bd Color clamping fixes. 2006-10-22 17:18:50 +00:00
Brian Paul
919cd2c3ba move/improve comments, clean up code in a few places 2006-10-21 23:21:35 +00:00
Brian Paul
ed324db249 fix another logic error in computing deferredTexture 2006-10-21 22:56:21 +00:00
Brian Paul
bb19e64d12 For deferredTexture, need to check if the fragment program/shader writes
the fragment Z.
2006-10-21 22:43:15 +00:00
Brian Paul
828d15a6e0 move interpolate_varying() call 2006-10-21 21:14:20 +00:00
Brian Paul
4676b6260f don't use params passed to Clear() 2006-10-21 21:13:40 +00:00
Brian Paul
f614a61905 Move interpolate_texcoords() and interpolate_varying() calls into shade_texture_span().
Added some INLINE hints.
2006-10-21 00:20:16 +00:00
Brian Paul
61c89be313 Consolidate some code into shade_texture_span().
Clean up logic for deferred texturing/shading.
2006-10-19 22:27:44 +00:00
Brian Paul
cd5a623386 fixed Fixed/Int bug 2006-10-19 22:26:29 +00:00
Brian Paul
7c76028937 remove temp code 2006-10-19 22:13:31 +00:00
Brian Paul
79b5d3e539 remove some debug/test changes 2006-10-19 20:11:15 +00:00
Brian Paul
464fcd0dd8 New bin/minstall script - a minimal replacement for 'install'.
Correctly handles symlinks so we can get rid of the COPY_LIBS stuff.
2006-10-19 20:09:05 +00:00
Brian Paul
c351858de8 fix problem when CHAN_BITS == 32 (bug 8704), remove unneeded assertion 2006-10-19 14:02:42 +00:00
Michal Krol
a79d4e75c3 Fix nonportable pointer+unsigned arithmetic. Use pointer+int. 2006-10-19 08:07:00 +00:00
Brian Paul
31293910b4 added clamp_colors(), updated assertions 2006-10-18 23:14:02 +00:00
Brian Paul
ff07d6de4c minor re-org, doxygen comments 2006-10-18 22:38:13 +00:00
Brian Paul
fee08575cd Changed install filenames to libGL* and libOSMesa* so things work on Darwin
where GL_LIB_NAME = libGL.dylib but the other library name is libGL.1.dylib
Unlike other platforms, the version number is in the middle of the name,
not at the end.
See bug 8671
2006-10-18 22:05:13 +00:00
Ian Romanick
3beaff1e3c Enable GLX_SGI_make_current_read for radeon.
Added code to track the drawable bound to the context for reading.  In
addition, when a drawable is initially bound (for reading or drawing)
or when the size of the drawable changes, update the size of the
framebuffer object that back the drawable (for software fallbacks).

Deprecate the old GetBufferSize interface.

Bump the driver date.

These changes were tested with wincopy on both direct rendering and
accelerated indirect rendering (AIGLX).
2006-10-18 20:27:11 +00:00
Brian Paul
ec99e716a2 Don't use x/y/w/h params given to Clear(). 2006-10-18 20:03:20 +00:00
Brian Paul
446972bc27 Want to stop passing x/y/width/height to Clear() function.
The coordinates need to be computed after we've got the hw lock.
Code updated to:
1. Ignore all/x/y/width/height/ params passed to Clear func.
2. Pass 0,0,0,0,0 to _swrast_Clear() until they're totally removed.
2006-10-18 20:02:42 +00:00
Brian Paul
ccb64bbb2a Don't pass x/y/width/height to ctx->Driver.Accum().
Compute the region after we've locked (and possibly updated the buffer's size).
Same thing is needed for ctx->Driver.Clear().
2006-10-18 18:35:09 +00:00
Brian Paul
4e4c0bbef7 glDrawPixels, line clipping bug fixes 2006-10-18 18:03:54 +00:00
Brian Paul
a1a0a29a5a Fix broken line clipping.
When both ends of the line were clipped, we were using the new v0 instead
of the original v0 when computing the location of the second vertex. Thus,
the second vertex's position was incorrect.
Thanks to Heath Feather for finding a test case.
2006-10-18 18:02:05 +00:00
Brian Paul
ff893a83f1 Fix a dangerous use of ASSERT in an else-clause not enclosed in braces.
We've been lucky if this hasn't been causing line rendering bugs.
2006-10-18 17:36:57 +00:00
Brian Paul
c3caaa3dd4 Always convert colors to float before running a fragment shader/program. 2006-10-17 22:23:32 +00:00
Brian Paul
32c3243e4d fix fog color bug 2006-10-17 22:22:42 +00:00
Brian Paul
c2074645cd Move struct atifs_machine into s_atifragshader.c
Add support for runtime colorbuffer types.
2006-10-17 21:12:32 +00:00
Brian Paul
e9d7190bb2 Seperate interpolate_colors() and interpolate_specular().
Fix bugs in apply_aa_coverage().
2006-10-17 20:40:22 +00:00
Brian Paul
b88af5b468 apply_aa_coverage() for ubyte/ushort/float 2006-10-17 20:22:53 +00:00
Brian Paul
0c6c8d5f1c new assertions - one of which is currently failing with arbfslight.c 2006-10-17 19:57:25 +00:00
Brian Paul
1c1c7fb361 remove obsolete intelBufferSize(), bump driver date 2006-10-17 18:54:19 +00:00
Brian Paul
42b26f688d Remove get_buffer_size()
Always check window size in XMesaMakeCurrent() in case glViewport is not
called.
2006-10-17 17:51:39 +00:00
Brian Paul
544b94e156 Lots of fixes/changes to select color depth at runtime. 2006-10-17 17:44:43 +00:00
Brian Paul
55e42e5b72 check if ctx->Driver.GetBufferSize==NULL and no-op 2006-10-17 17:43:47 +00:00
Brian Paul
af52ff0c99 include x86-64.h to silence warning 2006-10-17 17:03:21 +00:00
Brian Paul
1e3223c02a Fix CHAN_BITS=32 issues.
Save/restore array->ChanType in case colors are converted.
2006-10-17 17:03:00 +00:00
Brian Paul
8dff54e71d Added -clip option to test glCopyPixels beyond window bounds.
Clear dest window to black before copying.
Use glWindowPos2iARB().
2006-10-16 23:22:44 +00:00
Brian Paul
d40f20aebc Init _UseTexEnvProgram to fix failed assertion in i915_render_start() - this may be temporary 2006-10-16 22:02:33 +00:00
Brian Paul
16345022de Updates to intelWindowMoved():
Only need to call _mesa_resize_framebuffer() when we've detected a window
size change.
Set the drawFb->Initalized flag to GL_TRUE to avoid obsolete
Driver.GetBufferSize/ResizeBuffer calls in the Mesa code.
2006-10-16 21:39:34 +00:00
Ian Romanick
7b1ff32607 Track the currently bound read drawable and make sure its info is up
to date.
2006-10-16 20:59:53 +00:00
Ian Romanick
8c5ae80916 Fix build when DEBUG is defined but DEBUG_MATH is not.
A couple places attempted to call _math_test_all_*_functions when
DEBUG was defined.  These routines only exist when DEBUG_MATH is
defined.
2006-10-16 20:57:09 +00:00
Brian Paul
28081ae6c0 s/X86_SOURCES/ASM_SOURCES/ in ALL_SOURCES to try to fix make depend warnings (bug 8669) 2006-10-16 20:51:50 +00:00
Ian Romanick
6ae157f9e7 Fix bug #8563.
Fixes a GLX protocol problem when binding an indirect rendering context
after a direct rendering context.  In this case, the oldContetTag sent to
the server should be None, but the currectContextTag stored in the direct
rendering context (i.e., -1) was sent instead.
2006-10-16 17:50:19 +00:00
Brian Paul
041d64812e Set _NEW_BUFFERS in _mesa_resize_framebuffer(). This makes sure the swrast
module updates its state (CLIP_BIT) upon resizes.  The driver could do this
instead, but doing it here is safer.
2006-10-16 17:26:30 +00:00
Brian Paul
dc8a0d1936 remove some old code that could cause infinite recursion 2006-10-16 16:39:54 +00:00
Brian Paul
80fcbca7df allow >10 mipmap levels (patch by Benno Schulenberg) (bug 3130) 2006-10-15 22:30:35 +00:00
Brian Paul
cca1a27f77 regenerated to get DRI_CONF_EXCESS_MIPMAP() 2006-10-15 22:29:16 +00:00
Roland Scheidegger
97f47f771a fix handling of textures with a base internal format that does not have all four rgba values set for radeon and r200 (discovered with a modified glean pixelFormats test, noone ever noticed in over 2 years). For radeon, use hw format I8 as previously, and change tex env to make the correct default values appear for both GL_ALPHA and GL_LUMINANCE textures. For r200, which supports GL_LUMINANCE just fine, use the AL88 hw format for GL_ALPHA textures, since it seems like it's probably not worth the effort to fix up the texture environment (certainly complicated in case of ATI_fragment_shader programs). 2006-10-15 21:47:56 +00:00
Brian Paul
4d4add0972 Added #if / #else / #endif around code related to framebuffer initialization
to describe what should be changed in the drivers.
2006-10-15 19:26:43 +00:00
Brian Paul
606108ee4e updated comments, mark GetBufferSize() and ResizeBuffers() as obsolete 2006-10-15 19:20:29 +00:00
Brian Paul
694a5b81a7 minor clean-up: s/intel->driDrawable/dPriv/ 2006-10-15 19:08:11 +00:00
Brian Paul
a7a26503b6 Remove calls to _mesa_ResizeBuffersMESA() - generally replace with code to
check the current window size, then call _mesa_resize_framebuffer().
2006-10-15 18:51:22 +00:00
Brian Paul
a391384bad Remove a bunch of "ctx->Driver.function = _swrast_Function" lines since
default/fallback functions are already plugged in by the call to
_mesa_init_driver_functions().
2006-10-15 18:31:29 +00:00
Jerome Glisse
f0775c7fcc Use endianness test function provided by mesa.
Use the _mesa_little_endian helper function insted
of the MESA_BIG_ENDIAN flag. There is still place
using this flag but we need to find how to submit
16bits elements on big endian computer.
2006-10-15 18:22:28 +00:00
Brian Paul
2b6d2e4dcb Remove Driver.ResizeBuffers = _mesa_resize_framebuffer lines.
This is already done by the preceeding call to _mesa_init_driver_functions()
which plugs in default functions like that.
2006-10-15 18:18:39 +00:00
Brian Paul
b947377add increate MaxTextureLevels to 11 (bug 3130) 2006-10-15 17:57:53 +00:00
Brian Paul
a20c0f293e check if files exist before installing (Thierry Reding) 2006-10-15 16:38:09 +00:00
Brian Paul
07fd19f572 allow specifying image size on cmd line 2006-10-14 23:24:45 +00:00
Brian Paul
9cbe0e24ac Some code movement so that the gl_framebuffer is fully initialized before
calling _mesa_make_current() to avoid hitting the initialize_framebuffer_size()
stuff in context.c
2006-10-14 23:02:26 +00:00
Brian Paul
d21fa9cd79 Big re-org of buffer size management.
All buffer resizes now handled by xmesa_check_and_update_buffer_size() which
uses the _mesa_resize_framebuffer() function.
Moved all low-level XImage/Pixmap resizing into xm_buffers.c file.
Also, update lots of comments for Doxygen.
2006-10-14 22:52:17 +00:00
Brian Paul
2b46f4b853 cut and paste error: s/Width/Height/ 2006-10-14 21:33:06 +00:00
Brian Paul
2458aba0e9 build fix: s/Table/TableUB/ 2006-10-14 20:28:36 +00:00
Brian Paul
63f6802077 assorted clean-ups 2006-10-14 15:22:18 +00:00
Roland Scheidegger
cb977ae5f4 implement ARB_point_parameters and ARB_point_sprite on r200. The code is nearly the same as outlined in bug #4707, except it disables perspective correction for point sprites to make them actually work. And, separate the state atom into two as the tcl parameters would overwrite vertex program parameters when active. Also implement the GL_VERTEX_PROGRAM_POINT_SIZE_ARB option to make vertex programs outputting a point size work correctly (untested). Smooth points will still always be size 1. While here, enable gouraud shading for fog when using fog coord. 2006-10-13 22:10:05 +00:00
Brian Paul
40b88fd1f3 remove needless condition 2006-10-13 17:45:08 +00:00
Brian Paul
5b0edff412 Consolidate, move, fix code related to color index and stencil image transfer
operations (shift, offset, table lookup, etc).
2006-10-13 17:41:23 +00:00
Ian Romanick
4616513577 Fix dumb build errors.
I always build with -DGLX_USE_TLS, so I never hit these paths.  glapi.h is
required in some places because _glapi_Dispatch is declared there, but
_glapi_tls_Dispatch is declared in glthread.h.
2006-10-13 17:34:01 +00:00
Brian Paul
176501dfff In _mesa_pack_rgba_span_float() we don't need to make a temporary copy of
incoming colors when applying pixel transfer ops.  In all cases, the
caller either indicates there's no pixel transfer ops, or the incoming
colors are coming from temporary storage already and can be safely
modified.
2006-10-13 16:34:25 +00:00
Brian Paul
8a9b5518fb s/GLuint/GLbitfield/ 2006-10-13 15:11:47 +00:00
Brian Paul
bf8647a58b s/GL_FALSE/0x0/ 2006-10-13 15:10:55 +00:00
Brian Paul
6b998c5584 removed obsolete _mesa_pack_rgba_span_chan() 2006-10-13 15:00:35 +00:00
Brian Paul
c28d0f779a include glapi.h to fix broken build 2006-10-13 13:28:48 +00:00
Keith Whitwell
a2c50b0f4a Upload of interleaved arrays currently assumes that position is the
first element in the interleaved group.  Add a test to catch cases
where this isn't true and use per-array uploads instead.  Fixes compiz
glitches on x64.
2006-10-13 11:21:55 +00:00
Keith Whitwell
fd6341e574 Make sure instructions are zero'd out before use. 2006-10-13 11:20:25 +00:00
Keith Whitwell
e595ce79d6 Use unsigned long batchbuffer offset, fixes x64 warnings. 2006-10-13 11:19:38 +00:00
Keith Whitwell
b236715769 Fix printf warning. 2006-10-13 11:17:37 +00:00
Keith Whitwell
0dceffce33 Use unsigned long cast for checking pointer alignment, fixes x64 warnings. 2006-10-13 11:16:45 +00:00
Keith Whitwell
f06b9e4a8d Use mesa function to get opcode name rather than an internal table. 2006-10-13 11:14:43 +00:00
Michal Krol
201e6b9b75 Indent and cosmetic changes. 2006-10-13 08:44:32 +00:00
Brian Paul
e5a6fcc345 Revamp color table code.
Always store all color tables as both float and ubyte.
2006-10-13 00:44:31 +00:00
Brian Paul
e392c92250 adjust_colors() function replaces old _mesa_chan_to_float_span() function. 2006-10-12 23:48:57 +00:00
Brian Paul
0bfc56d7d3 use _mesa_map_ci8_to_rgba8() instead of _mesa_map_ci8_to_rgba() 2006-10-12 23:47:51 +00:00
Brian Paul
5bc33fe6f1 remove _mesa_chan_to_float_span(), rename _mesa_map_ci8_to_rgba() 2006-10-12 23:47:19 +00:00
Brian Paul
556c2fa3a3 _mesa_map_ci_to_rgba_chan() no longer used 2006-10-12 23:18:05 +00:00
Brian Paul
76e778dce5 Lots of changes to support runtime renderbuffer depths.
_swrast_read_rgba_span() now takes a datatype parameter.
New optimization for glReadPixels(format=GL_RGB).
New glCopyPixels optimization for the simple, common cases.
2006-10-12 23:17:02 +00:00
Brian Paul
4bb9f4115c don't use temp storage in _mesa_convert_colors() when possible 2006-10-12 23:14:19 +00:00
Brian Paul
57d719afb1 remove some debug code invalidated by prev check-in 2006-10-12 15:55:04 +00:00
Ian Romanick
f3f51bc844 Fix bug #4681.
glDeleteTextures and glDeleteTexturesEXT were erroneously listed as
aliases of each other.  For anything /except/ GLX protocol they are
aliases.  This set of changes allows functions that are functionally
identical but have different GLX protocol to be listed as aliases.

When building with GLX_INDIRECT_RENDERING set, different static
functions are used.  These functions determine whether the current
context is direct rendering or not.  If the context is direct
rendering, the aliased function (e.g., glDeleteTextures in the case of
glDeleteTexturesEXT) is called.  If the context is not direct
rendering, the correct GLX protocol is sent.

For a deeper explanation of what is changed, please see:
http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions
2006-10-11 22:37:14 +00:00
Brian Paul
8a5871a98c use GLvoid * for _swrast_write_zoomed_rgb/rgba_span() functions 2006-10-11 22:21:55 +00:00
Brian Paul
55fa6a2fdb rewrite/simplify the fast_draw_pixels() function 2006-10-11 22:07:01 +00:00
Brian Paul
f971e24cf0 use _mesa_convert_colors(), update some assertions 2006-10-11 22:03:34 +00:00
Brian Paul
32a966dad9 Added _mesa_convert_colors().
_mesa_clip_drawpixels() now handles Pixel.ZoomY==-1.
2006-10-11 22:02:36 +00:00
Brian Paul
86f0e0b9cc support for runtime renderbuffer depths 2006-10-11 20:14:08 +00:00
Brian Paul
9440868270 In xmesa_DrawPixels_8R8G8B() check if drawing into a window system buffer,
not a user-created FBO.
2006-10-11 17:45:06 +00:00
Brian Paul
c364c57a1c added shaderobjects_3dlabs.c 2006-10-11 16:34:23 +00:00
Brian Paul
bb252d696f remove 3dlabs.c 2006-10-11 16:26:09 +00:00
Brian Paul
ed52be8c3f sources for X.org xserver build 2006-10-11 16:05:59 +00:00
Brian Paul
d3112d36d7 List of source (.c) files in each directory.
To be included by X.org Makefile.am files so that lists of files don't need
to be hardcoded and frequently updated there.
2006-10-11 15:52:00 +00:00
Brian Paul
81968ec49d a step toward moving run-time vertex program state out of GLcontext 2006-10-10 22:45:50 +00:00
Brian Paul
c61ecf373e fixed NV_position_invariant 2006-10-10 21:44:55 +00:00
Brian Paul
39c4daa6bc Move the fp_machine struct into s_nvfragmprog.c since (except for program
debug) it's only used there.
2006-10-10 21:43:31 +00:00
Brian Paul
97a659337e s/GLuint/GLbitfield/ 2006-10-10 21:25:27 +00:00
Brian Paul
fe6947002f If program is position invariant, set VERT_BIT_POS in InputsRead field.
Fixes broken "OPTION NV_position_invariant".
2006-10-10 21:23:23 +00:00
Keith Whitwell
d886423b3c Use the mesa-provided texenv program rather than rolling our own.
Turn on texture crossbar support.
2006-10-10 08:58:43 +00:00
Ian Romanick
fcd758868b Added dispatch.html.
This new file documents Mesa's implementation of GL function dispatch.  It's
not quite complete, but I think there's enough there to make it useful.
2006-10-09 18:26:03 +00:00
Brian Paul
5ab9dcd761 return void instead of GLvoid for glClearDebugLogMESA(), glGetDebugLogMESA() 2006-10-09 16:09:30 +00:00
Ian Romanick
b8f26126e2 Updates for XCB. Bug 8560. 2006-10-09 15:25:03 +00:00
Brian Paul
d3b257374e added a SyncHandle() call, remove UnlockDisplay() call. (bug 8521) 2006-10-09 14:57:50 +00:00
Brian Paul
0a0cd3a8ae Updates for XCB. Bug 8560. 2006-10-09 14:55:46 +00:00
Ian Romanick
dba173077e Major clean up of MakeContextCurrent
Rearrange most of the internals of MakeContextCurrent.	Put all of the code to
bind the new context up front.	If that is successful, unbind the old context.
This saves a lot of code and removes some locking crazyiness.

This patch has been tested for indirect rendering with glxinfo, glxgears,
manywin, and wincopy.
2006-10-07 02:52:18 +00:00
Roland Scheidegger
fa65447d8c do not import arrays for generic arb attribs if the array is not enabled (same as for generic attribs for nv vp is already done). Since the requested stride is 16, otherwise the code would end up doing lots of unnecessary import work (in doom3, trans_4_GLfloat_4f_raw caused by that was by far the single most time-consuming function in the r200 driver, not importing the disabled arrays caused the cpu time spent in the driver to drop from 45% to 30%, though real-world gain was pretty minimal as it's not really cpu bound here in the first place). 2006-10-07 01:04:49 +00:00
Brian Paul
524bf7bbcf rewrite clear_rgba_buffer_with_masking() 2006-10-06 03:52:01 +00:00
Brian Paul
e18d0f82b6 deal with union/aliasing in convert_color_type() 2006-10-06 03:49:46 +00:00
Brian Paul
6e138dfa36 rewrite of read_fast_rgba_pixels() 2006-10-06 03:48:42 +00:00
Keith Whitwell
fcb48e3422 missing file 2006-10-05 19:16:46 +00:00
Keith Whitwell
68da677ae2 Accelerate glBitmap with a color expand blit. Nice speedup for demos
like 'fire' that display a help message or fps number this way.
2006-10-05 11:35:57 +00:00
Keith Whitwell
1eca12a7d9 Quieten debug message. 2006-10-05 11:34:01 +00:00
Keith Whitwell
496f9ddf35 eliminate rhw divide under some circumstances 2006-10-05 11:28:45 +00:00
Keith Whitwell
e7b0ec9ae7 Quieten debug message. 2006-10-05 11:27:13 +00:00
Ian Romanick
6921063520 Changes to generated code caused by the previous commits. 2006-10-04 22:33:54 +00:00
Ian Romanick
491a16fb0f Fix the ordering of extensions. 2006-10-04 21:59:51 +00:00
Ian Romanick
990c8a9df9 Keep indentation consistent with indent.
Remove code in the Python scripts that keeps the indentation of the
generated code consistent for all cases.  Instead, pass the generated code
through the indent command.  Unix tools for the win!
2006-10-04 21:55:55 +00:00
Ian Romanick
eaeaaf6205 Divide categories into four groups as they are processed from the XML. Add
an iterator to iterate over the categories in order, starting with "core"
versions, then ARB extensions, then numbered non-ARB extensions, and finally
unnumbered extensions.

Use the new iterator in a couple places to ensure that output that is
grouped by catgory is generated in a consistent order.

More changes to the scripts are coming.  The generated files will be
committed one time after all the changes are in.  Too bad we're not using
GIT, or this would be easy. :(
2006-10-04 20:45:59 +00:00
Ian Romanick
553b8334bb Add utility method client_supported_for_indirect.
The new method client_supported_for_indirect is used to determine whether or
not the client-side library supports the function for indirect rendering.
The may or may not have associated protocol that needs to be generated
(e.g., glVertexPointer does not, but glVertex3fv does).
2006-10-04 18:58:10 +00:00
Brian Paul
25e441e8e9 in MakeContextCurrent() use old display pointer for __glXSetupForCommand(), bug 8443 2006-10-04 16:22:24 +00:00
Brian Paul
5ed4e35ba5 use _swrast_span_default_color() in the disabled code too 2006-10-04 15:22:11 +00:00
Brian Paul
9b507639ab call _swrast_span_default_color() to simplify _swrast_Bitmap(), improved comments 2006-10-04 15:21:23 +00:00
Brian Paul
da62bcecfb minor formatting fix 2006-10-04 15:06:27 +00:00
Felix Kuehling
3fd5aa88ea Bugzilla 6242: [mach64] Use private DMA buffers (only)
https://bugs.freedesktop.org/show_bug.cgi?id=6242
Patch by George Sapountzis: https://bugs.freedesktop.org/attachment.cgi?id=6271

Update to new mach64 DRM 2.0.0 with private DMA buffers.
Handle EAGAIN in mach64FireBlitLocked: call drmCommandWrite up to
MACH64_TIMEOUT times when EAGAIN is returned.
Also handle EAGAIN in mach64FlushVerticesLocked.
2006-10-02 20:34:06 +00:00
Brian Paul
346a239f01 return null if no context 2006-10-02 15:20:23 +00:00
Brian Paul
cdb27e8242 New SWspan and SWspanarrays typedefs. 2006-10-01 16:03:05 +00:00
Michel Dänzer
46929c93d8 i915: Fix wait for scheduled swap on secondary display. 2006-09-29 10:22:54 +00:00
Brian Paul
7fa99ed3d8 updated protos for blend funcs 2006-09-29 02:15:23 +00:00
Brian Paul
d92da49bae more changes for runtime renderbuffer depths 2006-09-29 02:12:07 +00:00
Brian Paul
0ce6a2935c include mipmap.h 2006-09-29 01:26:55 +00:00
Brian Paul
24edd90159 Move mipmap generation functions, texture scaling functions into new
mipmap.c file.
2006-09-29 01:24:26 +00:00
Brian Paul
bb4b378c60 updated info about name mangling 2006-09-29 01:22:53 +00:00
Michel Dänzer
af866291da Synchronize drawable to the pipe where the bigger part can be visible.
This requires the DDX driver to set the corresponding fields in the SAREA,
so check its minor version.
2006-09-28 14:10:47 +00:00
Michel Dänzer
4abf2706e9 Add new I830 SAREA fields. 2006-09-28 14:10:07 +00:00
Michel Dänzer
ebc879014c Add helper function that returns the current vblank sequence of a drawable. 2006-09-28 14:09:20 +00:00
Michel Dänzer
638ece315f Add helper function to calculate the area of the intersection of two rectangles. 2006-09-28 14:08:38 +00:00
Michel Dänzer
941c866739 i915: Handle DRM_VBLANK_SECONDARY when scheduling buffer swaps. 2006-09-28 14:07:56 +00:00
Michel Dänzer
c2f1a1857e i915: Attempt to schedule buffer swap on target vertical blank when possible.
This has some advantages over the traditional way of first waiting for the
target vertical blank and then emitting the buffer swap, e.g.

* glXSwapBuffers returns immediately, only the next time the driver needs the
  hardware lock will it block until the target vertical blank. This should
  allow applications that don't intermix rendering and other processing to
  start processing for the next frame right away.
* It's less likely to produce tearing.
2006-09-28 14:07:12 +00:00
Michel Dänzer
7585fc989d Add driGetVBlankInterval() helper function.
This can be used by drivers to determine the current swap interval of a
drawable.
2006-09-28 14:04:19 +00:00
Michel Dänzer
7539fde334 driWaitForVBlank: Add support for secondary vertical blank. 2006-09-28 14:03:41 +00:00
Michel Dänzer
6a2f5c6752 Some restructuring of the driWaitForVBlank() code.
Also some minor fixes for detecting when the deadline is met or missed, in
particular wrt wraparounds of the sequence number.
2006-09-28 14:03:02 +00:00
Michel Dänzer
24bb3b3998 Make driDrawableInitVBlank() initialize the sequence number.
This prevents the first wait for vertical blank from timing out when the X
server has been running for a long time.
2006-09-28 14:02:05 +00:00
Brian Paul
1d914fe465 remove obsolete comment 2006-09-27 14:00:37 +00:00
Jeremy Kolb
07bacc2263 Update to use the new XCB naming convention. 2006-09-26 23:56:20 +00:00
Jeremy Kolb
3d7ee324ad Added function convertStringForXCB. Deals with the recent XCB naming convention switch.
Updated the generated code to use the new XCB naming scheme.
2006-09-26 23:47:04 +00:00
Jeremy Kolb
b68788a1ca Update linux-dr-xcb config file to use LIBDRM_CFLAGS 2006-09-26 23:45:28 +00:00
Jerome Glisse
9e82552c30 Remove r200 dependency
Remove r200 dependency from the code as r200 merged
driver never worked (right ?) and we want to clean
the code.
2006-09-26 17:35:41 +00:00
Jerome Glisse
c67d8678dd Remove r200 dependency.
Remove r200*.h files dependency.
2006-09-26 17:28:40 +00:00
Michal Krol
ea87987dda Prepend #extension 'MESA_shader_debug: require' to each shader. 2006-09-26 16:06:35 +00:00
Michal Krol
27f660c164 Add GLSL preprocessor. 2006-09-26 16:01:11 +00:00
Michal Krol
4303d22739 Fix Windows newlines. 2006-09-26 12:10:33 +00:00
Michal Krol
16647b739b Add syntax files for expression and directive preprocessor.
Fix syntax errors in builtin library 1.2 sources.
All derivative files (*_gc.h and *_syn.h) are generated by Makefile.
2006-09-26 11:43:30 +00:00
Brian Paul
a50b7dbc3b Initial work for supporting different renderbuffer color depths at runtime. 2006-09-25 23:57:39 +00:00
Michel Dänzer
df8632ebd8 Fix and re-enable swizzling paths for big endian platforms. 2006-09-25 16:34:40 +00:00
Keith Whitwell
cbdd7e1094 bring in active_sz mechanism from i965 driver. Fixes bug 8410 2006-09-25 09:14:26 +00:00
Keith Whitwell
f1945796ed Fixup one place where attrsz was being used instead of active_sz 2006-09-25 09:12:25 +00:00
Brian Paul
f515c78a23 Change logicop, blend, masking functions to use the colors/indexes in the
sw_span object, rather than an explicit parameter.
2006-09-24 19:59:30 +00:00
Brian Paul
ba001224a1 Roll the multi_write_rgba_span() code into _swrast_write_rgba_span(). 2006-09-24 19:46:42 +00:00
Brian Paul
0785b6052a use span.array->rgba instead of local var in accum_return() 2006-09-24 16:34:56 +00:00
Brian Paul
f11508c29f use span.arrays for color/indexes instead of a local var when doing masked clears 2006-09-24 16:31:23 +00:00
Ben Skeggs
a05db7f505 Kill all the current shader code. 2006-09-24 13:16:23 +00:00
Sean D'Epagnier
e184bd861c corrected cursor drawing
added handling of SIGWINCH
fixed input of recieving SIGIO while handling SIGIO
corrected input code for return
uncommented normal calculation to models
2006-09-24 10:57:26 +00:00
Brian Paul
1ad12874b3 allocate larger TempImage, use COMBO var to choose test format/type 2006-09-23 16:09:26 +00:00
Brian Paul
7b803d649a fix the broken fallback string/debug stuff 2006-09-22 19:28:36 +00:00
Brian Paul
5174e7c181 remove extra indentation 2006-09-22 19:09:50 +00:00
Brian Paul
43715c711d Get rid of _swrast_mask_rgba_array() and _swrast_mask_index_array(). 2006-09-22 17:44:39 +00:00
Roland Scheidegger
9f819dc014 fix up access to vertex attrib components which don't really exist but are defined to some default value by the spec (fogcoord yzw, normal w, secondary color w), by replacing those components with zero/one respectively using swizzling. 2006-09-22 15:48:50 +00:00
Keith Whitwell
9c5d75e592 Explicit test for +ve pitches in intelEmitCopyBlit() 2006-09-22 14:43:09 +00:00
Roland Scheidegger
8a0fb128c3 don't skip user clip plane clipping when the current vertex program is position invariant. 2006-09-22 13:34:24 +00:00
Keith Whitwell
7e9799ac3d Use _Enabled rather than _Active when checking for fragment shaders 2006-09-22 11:45:21 +00:00
Keith Whitwell
df058298e1 Flush driver, not just tnl module. 2006-09-22 11:40:35 +00:00
Keith Whitwell
f9bfdb1ce4 resize buffers in MakeCurrent 2006-09-22 11:36:30 +00:00
Keith Whitwell
f118b9b40d Remove unused variable. 2006-09-22 11:33:46 +00:00
Jouk Jansen
424749c3d5 Correcting directory name in OpenVMS-Makefile 2006-09-22 11:09:07 +00:00
Brian Paul
57d705d5a9 remove rgb[] array from span_arrays_struct - was only used in a few places 2006-09-21 23:19:40 +00:00
Brian Paul
c7d0fe1c4b new comments, indentation fixes 2006-09-21 23:04:29 +00:00
Brian Paul
4af404038c bump version to 6.5.2 2006-09-21 23:02:21 +00:00
Brian Paul
76785cb70a move a conditional into an assertion 2006-09-21 22:59:50 +00:00
Brian Paul
87c5ec817c updated doxygen info 2006-09-21 22:54:53 +00:00
Brian Paul
bb0862968e updated extension info 2006-09-21 22:53:15 +00:00
Brian Paul
60955d7f96 Re-org of per-release info.
From now on, put all release-specific info into the release-X.Y.Z.html file
rather than scattered between a relnotes file, versions.html and news.html.
2006-09-21 22:51:16 +00:00
Brian Paul
2482007373 replace assert(0) with error report, improved comments, etc 2006-09-21 22:43:51 +00:00
Keith Whitwell
bad5cf056a Fix incorrect byteswap_mapping(). Disable swizzle path on bigEndian
until someone can figure out whats wrong there.
2006-09-21 18:31:36 +00:00
Brian Paul
184b5d8938 use new _mesa_little_endian() function 2006-09-21 15:51:55 +00:00
Brian Paul
32e0efbdbe added _mesa_little_endian() 2006-09-21 15:51:06 +00:00
Brian Paul
81e0d73780 GLUT_FORCE_VISUAL env var to force glut to use a particular visual (debug only) 2006-09-21 15:16:36 +00:00
Brian Paul
b7d9b1e724 new code to init DirectColor colormaps 2006-09-21 15:14:30 +00:00
Keith Whitwell
167ca59fe8 Fix the dstMap for rgb888 and bgr888 texture formats, which are the
opposite to what you'd naively expect.
2006-09-21 12:43:05 +00:00
Keith Whitwell
cac5974bf9 Do a better job of choosing texture formats to avoid image conversions. 2006-09-21 10:20:15 +00:00
Keith Whitwell
afd244d4e8 use the requested internal texture format where possible 2006-09-21 10:07:04 +00:00
Keith Whitwell
76dd385fed Catch a couple of cases where we would have to delete and recreate the
miptree object.
2006-09-21 10:06:18 +00:00
Keith Whitwell
3974cc8c09 Deal with the overloading of _mesa_texstore_rgba, which is actually
used to store all sorts of formats.

Software mesa fails the glean pixelFormats test, but it appears to be
failing even with the swizzle code disabled??
2006-09-20 22:40:34 +00:00
Keith Whitwell
3aea82b396 Extend swizzle support to all remaining source formats and texture
destination formats.
2006-09-20 22:02:48 +00:00
Roland Scheidegger
62d4dfbfe3 try to use a 8888 texture format which will result in only a memcopy in mesa's texstore functions whenever possible for r200 and r300. r200 can use hw formats argb8888, rgba8888 and abgr8888 (or the opposite on big endian), r300 can use argb8888, bgra8888, rgba8888 and abgr8888 regardless of endian, as it supports free component swizzling. 2006-09-20 19:11:56 +00:00
Keith Whitwell
46c3bd29be Support both big and little endian, more source types and more
destination formats through the swizzle path.  It would be great to
see this tested on eg, PPC machines...
2006-09-20 18:56:19 +00:00
Roland Scheidegger
528de982f8 reenable code in _mesa_texstore_rgba8888 to avoid the generic copy path if only swizzling is required as it works just fine (tested with glean pixelFormats test and a hacked up r200 driver which always uses that format). 2006-09-20 18:22:19 +00:00
Keith Whitwell
2e5c686c2b Fix various typos to pass glean pixelFormats test. 2006-09-20 17:41:18 +00:00
Keith Whitwell
fce0d13b4f Enhance compute_component_mapping() to convert to and from any of the
color base formats.
2006-09-20 17:07:13 +00:00
Keith Whitwell
4f17378ec3 Add a comment about the interactions of negative pitches, overlapping
blits and the different ways of specifying a blit on this hardware.
2006-09-20 15:04:05 +00:00
Keith Whitwell
f1d6ad6fe2 remove some dead code 2006-09-20 15:00:24 +00:00
Keith Whitwell
b5d0f6c17f Fix some warnings 2006-09-20 14:58:55 +00:00
Roland Scheidegger
85b6d0c4df fix mixed texgen/non-texgen with texgen modes requiring plane parameters (GL_OBJECT_LINEAR, GL_EYE_LINEAR). This is a chip limitation, try to hack it up regardless or use a tcl fallback in some cases. Might still produce wrong results if fixed up, but so far this corrects celestia ring shadows (in multitexture mode), doom3 (arb renderer), quake4 (arb renderer and some less visible bugs in r200 renderer), and even the remaining texgenmix broken case (this is pure luck though, it is easy to construct artifical cases where it will break). 2006-09-20 14:56:21 +00:00
Keith Whitwell
e38114a5e4 Support ARB_texture_rectangle. 2006-09-20 14:54:49 +00:00
Keith Whitwell
b35121d54d 1) Add a new flag in the sarea (coopting the unused texAge value) to
identify context switches between members of a share group -
ie. multiple contexts in a single application, possibly on different
threads.  In this case the contexts share a bufmgr instance and there
is no need to evict textures - so don't.

2) Use a new flag 'need_flush' to ensure hardware rendering is flushed
prior to starting a software fallback.
2006-09-20 14:44:40 +00:00
Keith Whitwell
3a5319293c Broadwater seems to prefer this style of blitting. 2006-09-20 14:39:53 +00:00
Brian Paul
d41d29b8bd make current GLX context per-thread 2006-09-20 14:39:47 +00:00
Brian Paul
0c54e47c0e fix a memleak in DestroyContext() 2006-09-20 14:39:24 +00:00
Keith Whitwell
83c3f9658d add accelerated glCopyPixels path 2006-09-20 14:36:49 +00:00
Keith Whitwell
187f2cfb4a Add a new internal program parameter value STATE_TEXRECT_SCALE which
provides 1/width and 1/height of the active texture, useful for
implementing ARB_texture_rectangle support on hardware which only
supports ARB_npot-style texturing.
2006-09-20 14:30:22 +00:00
Keith Whitwell
0c9259f3b9 Fix _mesa_swizzle_ubyte_image() to deal with RGBA->RGB->RGBA
conversions, ensuring that the final A value is 0xff in those cases
where we use a RGBA hardware texture format to store RGB textures.
Fix a couple of cases where hardwired texture conversions were
ignoring this restriction.
2006-09-20 14:28:42 +00:00
Keith Whitwell
5658810660 Export _mesa_print_alu_instruction() to allow drivers to roll their
own debug code for programs with driver-private opcodes.

Remove redundant loop in _mesa_num_inst_src_regs().
2006-09-20 12:57:54 +00:00
Keith Whitwell
cb54c056a6 restore debug output after brw_wm_fp compilation stage 2006-09-20 12:53:35 +00:00
Keith Whitwell
285801a9ed Use DEBUG_SYNC to switch between per-primitive and per-frame aubfile dumps. 2006-09-20 12:49:52 +00:00
Brian Paul
408ce7e861 added LIBDRM_CFLAGS (Javier Villavicencio) 2006-09-19 22:43:41 +00:00
Brian Paul
dc4bf43898 fix CFLAGS (bug 8344) 2006-09-19 16:31:37 +00:00
Brian Paul
c42afefda1 change make depend output redirection to 2>&1 (bug 8344) 2006-09-18 22:55:13 +00:00
Brian Paul
876b41bc03 check for n <= 1 in compute_min_mag_ranges(), bug 8320 2006-09-18 15:03:04 +00:00
Brian Paul
f7da4e687c set lambda to zero for textured points (bug 8320) 2006-09-18 15:02:26 +00:00
Stephane Marchesin
7d907ef69c Some small changes 2006-09-17 17:46:36 +00:00
Stephane Marchesin
473a38622e Rename nouveau_tris.* to nouveau_swtcl.* 2006-09-17 15:30:40 +00:00
Stephane Marchesin
c67f545520 Small changes 2006-09-17 14:36:07 +00:00
Stephane Marchesin
e324c52237 Make nouveau actually compile 2006-09-17 12:09:11 +00:00
Stephane Marchesin
908388b118 Some work towards making the nv10 swtcl compile 2006-09-17 11:58:52 +00:00
Brian Paul
3d70f9ff82 6.5.1 md5 sums 2006-09-16 04:23:16 +00:00
Brian Paul
0321dac2cd update 6.5.1 release date 2006-09-16 04:13:20 +00:00
Brian Paul
a3a640171f added #ifdef tests for Windows for int64_t, uint64_t 2006-09-16 04:10:56 +00:00
Brian Paul
8636981646 replace GLAPI w/ static and init var to 0 (Michel Donais) 2006-09-15 19:00:37 +00:00
Keith Whitwell
54d3ab4878 npot version of redbook/mipmap.c 2006-09-15 10:41:54 +00:00
Ian Romanick
a3b99fcb56 Use correct opcodes for GLX_EXT_texture_from_pixmap.
Set the correct opcodes for GLX_EXT_texture_from_pixmap functions.  Changes
to the glproto package and the core X server are also required.
2006-09-14 21:07:17 +00:00
Brian Paul
eee85373c7 set 6.5.1 release date 2006-09-14 20:31:13 +00:00
Jerome Glisse
3dcf23171d Fallback if ColorLogicOp is enabled. Cleanup a bit the fallback
function.
2006-09-14 17:44:58 +00:00
Michel Dänzer
8c9366a807 Remove MESA_LITTLE_ENDIAN guard for code that seems to work fine on big endian. 2006-09-14 16:17:06 +00:00
Keith Whitwell
657f738ea2 VS nr of urb entries is constrained to be one of a fixed set of values,
specifically {8,16,32}.
2006-09-14 10:37:09 +00:00
Roland Scheidegger
6babf624b7 always use argb8888 instead of rgba8888, this is far more likely to hit a faster memcopy path in mesa (at least on little endian systems, possibly on big endian too) 2006-09-13 23:56:09 +00:00
Roland Scheidegger
2e2a981335 detect some more cases which can use straight memcpy for _mesa_texstore_rgba8888 2006-09-13 23:51:39 +00:00
Roland Scheidegger
99e0236046 Always mark tex state atom as dirty when the texture image is dirty, this ensures texture cache gets flushed in case the new texture has the same offset as the old one (fixes glean pixelFormat test at least on r200). 2006-09-13 23:20:10 +00:00
Brian Paul
43aa034084 updated comment 2006-09-13 22:49:48 +00:00
Roland Scheidegger
888b1a9166 don't use derived value _ColorLogicOpEnabled as it's not current by the time we call the blend/logic op functions. Fixes glean logicOp test on r200. 2006-09-13 22:41:46 +00:00
Brian Paul
fd2e402359 added GL_CURRENT_RASTER_SECONDARY_COLOR query (OpenGL 2.1) 2006-09-13 21:02:32 +00:00
Brian Paul
bd5331f9e8 just comments and const qualifiers 2006-09-13 20:26:43 +00:00
Brian Paul
ac1d7370a7 fix broken do_EXP() 2006-09-13 20:14:24 +00:00
Roland Scheidegger
cb08dcbbf2 fix GL_REFLECTION_MAP texgen by not using tex matrix negation when lighting is not enabled (?). This fixes demos/cubemap as well as glean texCube test. 2006-09-13 17:35:44 +00:00
Roland Scheidegger
87d6028f28 make sure we upload the new vertex program if the program string changes. 2006-09-13 17:30:11 +00:00
Brian Paul
25d59d2962 make triangle smoothing a sw fallback (Martign van Oosterhout) 2006-09-13 16:41:25 +00:00
Jerome Glisse
323414940f Fix compilation warning. 2006-09-12 18:52:13 +00:00
Jerome Glisse
6a65e6db3d Removing some of r200 dependency, cleaning up code a bit,
and fixing a couple of warning. More cleanup and shuffle
to come. I have tested this change they might broke things
especialy with r300_texstate.c change (format_x doesn't
seems to be use at all by r300).
2006-09-12 18:34:43 +00:00
Keith Whitwell
b1cb39d8bd quieten debug 2006-09-12 14:27:57 +00:00
Keith Whitwell
16a22a5f4a Potential fix for doom3 lockups. Seems that there is a conflict
between the vertex cache, the vertex shader and the clipping stages,
all of which are competitors for URB entries assigned to the VS unit.
This change reduces the maximum number of clip and VS threads by
enough to ensure that they cannot consume all the available URB
entries, and then reduces the number somewhat more up to an arbitary
amount I discovered by trial and error.  Unfortunately trial and error
solutions don't inspire total confidence...
2006-09-12 13:54:31 +00:00
Keith Whitwell
72e810db9d Disassemble active program when DEBUG_VS is set. 2006-09-12 13:51:09 +00:00
Keith Whitwell
7b8c73460f Add code to tweak aubfile state and primitives on replay. 2006-09-12 13:50:22 +00:00
Keith Whitwell
e1ae10db2c Encode a unique id in the aub header date fields. 2006-09-12 13:43:10 +00:00
Brian Paul
bd38df11f4 Win32 fixes (SF bug 1554931) 2006-09-11 16:39:04 +00:00
Brian Paul
31a66ada72 undo some accidental changes in _mesa_is_legal_format_and_type() 2006-09-11 15:25:49 +00:00
Brian Paul
02aa5fba03 init accum buffer fields in _mesa_update_framebuffer_visual() 2006-09-11 15:04:23 +00:00
Roland Scheidegger
25847f2b5b remove code to deal with non-normalized texture coordinates for tex rect targets (swtcl tex coord translation stage, tcl tex matrix adaption) and use the chip's native handling of such coords instead (!!!). Seems noone noticed those bits in the se_coord_fmt reg, even though it works fairly similar to r200 (except it's set per-unit and always active, so only enable it for texture rectangles). 2006-09-10 19:19:13 +00:00
Brian Paul
cb53555058 Redefine the BYTE_TO_FLOAT() and SHORT_TO_FLOAT() macros to avoid problems
converting 0 to exactly 0.0
This goes against the OpenGL spec (see table 2.6) but solves problems
when doing byte -> float -> ubyte conversion for particular texture formats.
2006-09-10 17:42:57 +00:00
Brian Paul
ef8244df1a don't use xmesa_DrawPixels_8R8G8B() if there's a software alpha channel 2006-09-10 17:10:36 +00:00
Roland Scheidegger
7998962444 cause a raster fallback if a yuv texture is used on texture unit > 0 as yuv conversion appears only to work on first unit. 2006-09-10 13:48:51 +00:00
Patrice Mandin
ae481e1560 oops, time to go to bed 2006-09-08 23:19:45 +00:00
Patrice Mandin
ddaf3060fa nv10: vertex attribute output format 2006-09-08 23:18:27 +00:00
Patrice Mandin
cdd433b29b more macros, still missing the alloc_verts one 2006-09-08 21:52:25 +00:00
Patrice Mandin
1961611247 reimport sw stuff 2006-09-08 21:41:58 +00:00
Patrice Mandin
7a968481a0 render_primitive macro 2006-09-08 21:34:47 +00:00
Patrice Mandin
07d4c63ddc vert_copy_spec macro 2006-09-08 21:30:32 +00:00
Patrice Mandin
ad0f655376 vert_copy_rgba macro 2006-09-08 21:27:17 +00:00
Patrice Mandin
6f0388ec71 basic primitives 2006-09-08 21:23:04 +00:00
Patrice Mandin
179c1013d2 Remove useless reference to fifo_num field 2006-09-08 20:17:59 +00:00
Keith Whitwell
02df36f394 Basic facility for playing back captured aubfiles. Requires a small
hack to the drm to disable command verification on the cmd_buffer
ioctl.  Doesn't exactly replay as commands are normally delivered as
batchbuffers but are captured and replayed as commands on the ring.
2006-09-08 10:36:32 +00:00
Roland Scheidegger
a5e73e6887 cause a vtxfmt fallback directly when hitting NewList for radeon and r200 drivers, otherwise we'll mix up tcl and vtxfmt path for some reason. This fixes a warzone2100 asssertion failure. 2006-09-08 00:54:55 +00:00
Keith Whitwell
3e05902d30 Consistent return values from the bm* functions.
Get aubfile generation working again.
2006-09-07 19:58:16 +00:00
Keith Whitwell
493b2ddecb Cope with memory pool fragmentation by allowing a second attempt at
rendering operations to take place after evicting all resident
buffers.

Cope better with memory allocation failures throughout the driver and
improve tracking of failures.
2006-09-07 19:05:40 +00:00
Keith Whitwell
c26f36c830 Add some asserts, fix some not-quite-bugs. 2006-09-07 18:28:35 +00:00
Keith Whitwell
e48db4430f Fix glitch with pool alignments. 2006-09-07 16:29:37 +00:00
Keith Whitwell
1456a0fff6 Use lower alignments where possible. Also pad out allocated blocks to
a multiple of alignment to avoid accumulating unusable free blocks.
2006-09-07 16:23:22 +00:00
Keith Whitwell
133f141680 Make sure bmBufferOffset is called for all active buffers every time
we render.  Currenly requires that some state be re-examined after
every LOCK_HARDWARE().
2006-09-07 16:09:50 +00:00
Roland Scheidegger
c5cb8e2c6f make really sure R200_VAP_PROG_VTX_SHADER_ENABLE is never set when we're already in a tcl fallback, otherwise the chip will instantly lock up when vertex progs are enabled the next time not in a tcl fallback (fixes for instance guaranteed lockup running any program which uses vertex progs with tcl_mode=0 and then later with tcl_mode=1). 2006-09-07 13:34:29 +00:00
Roland Scheidegger
28e7219b96 only allow VERT_ATTRIB_MAX instead of _TNL_ATTRIB_MAX for inputs of vertex programs (fixes a segfault since the result of the shift is undefined otherwise, and it may happen that _TNL_ATTRIB_POINTSIZE will be tried to read, unlike all other attribs this however may be unitialized (might be a bug in itself)). 2006-09-07 13:26:44 +00:00
Eric Anholt
d016d4e70f Fix a leak of the screen's option cache on cleanup (copied from radeon). 2006-09-07 06:02:00 +00:00
Keith Whitwell
14ec34d647 Simplify the immediate and displaylist code. Treat VertexAttrib*ARB
as non-aliasing and cope with the >32 attributes that result, taking
materials into account.
2006-09-06 18:30:00 +00:00
Brian Paul
2216aac8ea comment out EXTRA_LIB_PATH, ?= causes problems on HP-UX 2006-09-06 13:56:26 +00:00
Brian Paul
bb2180dca3 Fixes from Christopher Bell:
Use -O instead of +O3 or +O2.
Remove +Oaggressive.
Replace -Aa with -Ae.
2006-09-06 13:49:17 +00:00
Brian Paul
7d767604c7 remove stray tab 2006-09-06 13:44:57 +00:00
Brian Paul
d9aebd8498 for VERTEX_ATTRIB_WEIGHT, use break, not return 2006-09-06 05:03:47 +00:00
Brian Paul
4a901667e5 document vertex.weight hack 2006-09-05 23:20:58 +00:00
Brian Paul
3a55750d48 Hack for Warcraft (bug 8060): allow 'vertex.weight' to be referenced in
vertex program, even though it's not really supported.  Results will be
undefined, but Warcraft doesn't actually use the attribute.
2006-09-05 23:15:29 +00:00
Brian Paul
43cc1dc18f fix typo in enable_parser_extensions(): s/point_parameters/vertex_blend/ 2006-09-05 23:11:09 +00:00
Brian Paul
a088f160b3 Consolidate common case of _mesa_set_program_error() followed by _mesa_error()
in new program_error() function.
Add const qualifiers in many places.
Reorder some debug code to prevent referencing free'd memory.
2006-09-05 23:08:51 +00:00
Brian Paul
1f03339f1c updated info about glxproto.h 2006-09-05 18:23:21 +00:00
Keith Whitwell
d5cbb49c22 Dynamically allocate instruction store for tnl programs according to
requirements.
2006-09-05 10:01:24 +00:00
Keith Whitwell
74b2166ff8 Fixes for calculating point attenuation 2006-09-04 23:34:36 +00:00
Keith Whitwell
f65ad97469 Don't export NV_vertex_program as it's not supported, it confuses
glean, and we no longer need to export it to keep Mesa happy as we did
at one time.
2006-09-04 18:27:40 +00:00
Rune Petersen
ac7ea94030 Managed to make a commit that can't build... Sorry again... 2006-09-04 16:20:16 +00:00
Brian Paul
c78e895f09 get rid of GL_BOOLEAN definition (bug 8113) 2006-09-04 14:07:04 +00:00
Jouk Jansen
e08557ad8a OpenVMS compile support update
(previous commit did send the wrong file to the CVS)

 Modified Files:
 	Mesa/include/GL/vms_x_fix.h
2006-09-04 06:26:08 +00:00
Jouk Jansen
8cf3c85fd7 OpenVMS compile support update
Modified Files:
 	Mesa/include/GL/vms_x_fix.h
2006-09-04 06:22:39 +00:00
Roland Scheidegger
014bfda235 fog state atom contains (only) fog params necessary for tcl. Must not be emitted if vertex progs are enabled as it overlaps vertex param #94. 2006-09-04 00:57:39 +00:00
Rune Petersen
5300e8242f add missing change to skip low impact RAST fallback...
Sorry.
2006-09-03 20:31:52 +00:00
Roland Scheidegger
5b4e7cdca4 fix the presumably broken check for the allow_large_textures and vblank_mode options (same as bug 8042). 2006-09-01 23:36:30 +00:00
Roland Scheidegger
91650469ae make sure vertex programs are only enabled on the hw when they are really enabled, not just when a program enables vertex progs (could still be not enabled due to some error). Otherwise the hw potentially would try to execute a not valid (not set up at all) vertex program, likely leading to lockups. Hopefully fixes #8060. 2006-09-01 20:21:12 +00:00
Keith Whitwell
6ec2d37ae8 Catch a few more cases of using a message reg as an instruction source
arg.
2006-09-01 14:57:19 +00:00
Keith Whitwell
db0e53af74 fix a couple of cases where a message reg is used as an instruction source. 2006-09-01 14:18:06 +00:00
Ian Romanick
75faa1e19a Add API description for GLX_SGI_swap_control. 2006-08-31 20:50:43 +00:00
Ian Romanick
d6c675f497 Fix problems with vertex program protocol
There were two sets of bugs in the vertex program (ARB and NV)
protocol.  First, several of the ARB functions were missing the
'doubles_in_order="true"' annotation.  Second, after the ARB decided
that glVertexAttrib*ARB functions must not alias fixed-function state
for GLSL, Nvidia re-assigned GLX protocol opcodes for
glVertexAttrib*NV (circa Septeber 2004).  For some reason gl_API.xml
was never updated to reflect this, and the updated version of the
GL_NV_vertex_program spec never made into the registry.
2006-08-31 20:41:16 +00:00
Rune Petersen
934a2dcf0f re-apply shader fix.
appears to have been reverted by mistake.
2006-08-31 18:19:50 +00:00
Brian Paul
d9cb0fc44d version bump 2006-08-31 17:54:31 +00:00
Keith Whitwell
b237d7fa14 When using the old technique to set up the front buffer mapping, there
is no need to add front.offset to sPriv->pFB, it seems.  Fixes several
glean issues and frontbuffer rendering generally.
2006-08-31 17:24:55 +00:00
Brian Paul
6c44c53e06 update link 2006-08-31 15:19:44 +00:00
Brian Paul
c09458c133 remove VERSIONS from tarballs 2006-08-31 15:18:04 +00:00
Brian Paul
761d87485e updated 6.5.1 relnotes link 2006-08-31 15:17:43 +00:00
Brian Paul
e2859ea6ef Convert VERSIONS and RELNOTES-6.5.1 to html, update links to them. 2006-08-31 15:16:10 +00:00
Rune Petersen
3cbfef3917 Give the user posibility to choose speed over correctness.
It does 2 things:
1) Allows you to disable S3TC, wine-games sometimes need S3TC enabled.
2) Disable fallbacks that usually have low impact.
2006-08-31 15:15:29 +00:00
Brian Paul
52e36cd8d9 check if ext->name is null before strcmp() 2006-08-31 13:58:08 +00:00
Roland Scheidegger
901f83f14e do not abort with not supported vertex prog output configuration, fallback instead 2006-08-31 01:10:07 +00:00
Brian Paul
7986cfbee0 remove extension defines/protos that are now in glext.h 2006-08-30 23:50:31 +00:00
Brian Paul
3cd07d2c39 latest version from OpenGL ARB 2006-08-30 23:46:41 +00:00
Karl Schultz
cdb12bd0ae Handle API and dispatch table changes that removed a bunch of extension entry points. 2006-08-30 23:45:32 +00:00
Brian Paul
c6f8176b3f make prog2 a legal program (texture reference fix) 2006-08-30 23:40:53 +00:00
Brian Paul
b7fc1c32f8 Check that we don't try to reference more than one target of a texture unit.
For example, referencing both "texture[0], 2D" and "texture[0], CUBE" in one
program is an error.
2006-08-30 23:38:03 +00:00
Brian Paul
f6de865e56 s/0/VERT_RESULT_HPOS/ 2006-08-30 23:36:52 +00:00
Ian Romanick
a70d56485a Add missing parenthesis so that glXSwapIntervalSGI protocol is
correctly generated.
2006-08-30 23:15:02 +00:00
Michal Krol
c7f571eb7e Add missing vec4 instructions to the interpreter.
Other cosmetic changes.
2006-08-30 22:36:29 +00:00
Brian Paul
8a4366717a fix Xlib driver mem leaks 2006-08-30 22:04:09 +00:00
Brian Paul
6c06ce281a Use XAddExtension() to register an XCloseDisplay() callback function.
When the callback is called, free all Mesa's private visual and buffer
data structures which are tied to the display.
Fixes problems reported by Kitware.
2006-08-30 21:17:51 +00:00
Brian Paul
12a5f812fc init a local var to silence warning 2006-08-30 19:02:45 +00:00
Roland Scheidegger
a974aaaa3e Minor r200 vertex program cleanups. Remove disabled leftovers from r300 vertex program code. Fix authors. Correct slightly wrong check to determine if ran out of temps. Simplify check to determine if ran out of max instructions. Correctly report used native temps. Always kick off program translation when ProgramStringNotify is called (otherwise the reported native resources used queried might be wrong). 2006-08-30 13:44:31 +00:00
Roland Scheidegger
e6de1edaf0 fix initialization of native resource usage of vertex/fragment programs 2006-08-30 11:55:18 +00:00
Roland Scheidegger
ef3f00f67e fix typo causing a segfault when a vertex program uses more than 96 parameters 2006-08-30 10:26:31 +00:00
Brian Paul
8334c8a216 Move call to _swrast_update_rasterflags() since it depends on the
results of _swrast_update_fog_state().
Fixes bug where first frame of progs/samples/fog.c does not show fog.
2006-08-29 22:32:31 +00:00
Brian Paul
f7c4dc007f _mesa_debug() should be a no-op when not compiled with DEBUG defined. 2006-08-29 22:30:58 +00:00
Brian Paul
398471429b set 6.5.1 release to Aug 31 2006-08-29 21:56:59 +00:00
Brian Paul
70c2d51230 remove assertion that referenced &glSetFenceNV for debug test 2006-08-29 21:54:01 +00:00
Brian Paul
0aab798a18 replace abort with _mesa_problem() 2006-08-29 19:09:57 +00:00
Ian Romanick
8d675aa637 Deprecate GL_EXT_vertex_weighting.
Nvidia no longer supports this extension, and they no longer export its
entry points from their libGL.  There's no reason for us to keep dragging it
around either.
2006-08-29 17:44:45 +00:00
Ian Romanick
dfdd0b4f30 More static dispatch function removal.
Make functions for the following extensions available only via
glXGetProcAddress.  In cases where there are other aliases to the same
functions (e.g., between GL_EXT_histogram and GL_ARB_imaging), the alias
functions may still be statically exported.

    - GL_ATI_blend_equation_separate
    - GL_EXT_blend_equation_separate
    - GL_EXT_convolution
    - GL_EXT_color_sub_table
    - GL_EXT_cull_vertex
    - GL_EXT_depth_bounds_test
    - GL_EXT_framebuffer_blit
    - GL_EXT_histogram
    - GL_EXT_multisample
    - GL_EXT_stencil_two_side
    - GL_EXT_timer_query
    - GL_IBM_multimode_draw_arrays
    - GL_INGR_blend_func_separate
    - GL_NV_fence
    - GL_SGI_color_table
    - GL_SGIS_multisample
    - GL_SGIS_pixel_texture
    - GL_SGIS_point_parameters
    - GL_SGIX_pixel_texture
2006-08-29 16:43:44 +00:00
Ian Romanick
fc5b57b713 Clean up GLX function exports.
Make functions for the following extensions only accessable via
glXGetProcAddress:

    - GLX_EXT_texture_from_pixmap
    - GLX_MESA_copy_sub_buffer
    - GLX_MESA_release_buffers
    - GLX_MESA_swap_control
    - GLX_MESA_swap_frame_usage
    - GLX_OML_sync_control
    - GLX_SGI_make_current_read
    - GLX_SGI_swap_control
    - GLX_SGI_video_sync
    - GLX_SGIX_swap_barrier
    - GLX_SGIX_swap_group

Removed all remnants of the following extensions:

    - GLX_MESA_set_3dfx_mode
    - GLX_SGI_cushion
    - GLX_SGIX_dmbuffer
    - GLX_SGIX_video_resize
    - GLX_SGIX_video_source
    - GLX_SUN_get_transparent_index
    -
2006-08-29 15:38:19 +00:00
Roland Scheidegger
af1dc7e487 move initialization code aroudn so glPointParameter isn't called before checking the extension is present 2006-08-28 21:19:34 +00:00
Brian Paul
b5a2fc1255 Check mesa_vp->Base.NumInstructions == 0 instead of mesa_vp->Base.String to
determine if we actually have a program.  See "[r300] TCL fallback with Quake3".
2006-08-28 19:42:41 +00:00
Ian Romanick
258751f4a0 Add two new gl_function methods. dispatch_name returns the name of
the true static dispatch name (either the glFooBar name or the
gl_dispatch_stub_XXX name).  static_name returns the name of the
static function for a specific alias of a GL function.

Adding (and using) these two functions corrects some problems in the
generated code related to functions with multiple aliases where some
of the aliases have true static dispatch functions and some don't.  I
have verified that everything under progs, except xdemos/xdemo,
correctly link.  I did this by doing 'make linux-dri-x86-64
PROGRAM_DIRS="demos redbook samples xdemos tests"'.
2006-08-28 17:40:45 +00:00
Ian Romanick
0bb27c084d Add dependencies for all API XML files. 2006-08-28 17:35:54 +00:00
Brian Paul
e5bc35dd97 remove unused var 2006-08-28 15:16:49 +00:00
Brian Paul
e365b82be1 fix the check for force_s3tc_enable (bug 8042) 2006-08-28 15:16:36 +00:00
Brian Paul
b9ac4afff7 omit installmesa script from tarballs 2006-08-28 15:12:07 +00:00
Brian Paul
a394f546a4 check for GL_ARB_point_parameters 2006-08-28 14:20:19 +00:00
Aapo Tahkola
9cb82f7917 close #6318 2006-08-27 13:24:36 +00:00
Sean D'Epagnier
a38aef93ab The colormap code is now simpler, 15bpp works where it did not before.
The input is fixed so that delete reports '\b' and backspace 127

The vt switching works both right and left.
2006-08-27 01:16:09 +00:00
Ian Romanick
7e9737b370 Explicitly store the names for each function that should have a static
entry point generated.  This allows us to do things like generate a
static entry point for glPointParameterfvARB but not for
glPointParameterfvSGIS.
2006-08-26 21:26:55 +00:00
Alan Hourihane
092d14be92 Fix bug 8010 - locking issues. 2006-08-26 21:21:34 +00:00
Aapo Tahkola
2fd72a7844 fix #8008 2006-08-26 16:24:04 +00:00
Brian Paul
0c46a12365 delete buffers, destroy window upon exit 2006-08-25 22:13:08 +00:00
Brian Paul
6827cf4d9a include texobj.h to silence warning 2006-08-25 22:08:43 +00:00
Brian Paul
96ee800cd4 6.5.1 bug fixes 2006-08-25 22:07:40 +00:00
Brian Paul
4277ea4c0b Error detection/reporting was broken in several places. 2006-08-25 22:06:02 +00:00
Ian Romanick
3fea5910b9 Add a couple of the missing GL 2.0 functions. Enable GLX protocol for
glBlendEquationSeparateEXT.  Add missing enum "get" information for
GL_EXT_texture_filter_anisotropic.
2006-08-25 19:57:37 +00:00
Brian Paul
58d080b025 Free vertex program TnlData, if any. Fixes a mem leak. 2006-08-25 19:46:31 +00:00
Brian Paul
473f1aca7f clamp result.depth to [0,1] if written to 2006-08-25 19:45:31 +00:00
Brian Paul
439d59926a Remove XFree86 CVS keyword. 2006-08-25 18:07:49 +00:00
Brian Paul
a360bc31da Rearrange glBindProgram() code to do all error checking before changing
the binding.  Prevent a potential dangling pointer error.  SF Bug 1544507.
2006-08-25 17:18:56 +00:00
Brian Paul
4bae9a48ec In _save_End(), set CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END if
we're in GL_COMPILE_AND_EXECUTE mode.
This fixes bug 7984.
2006-08-25 15:44:09 +00:00
Brian Paul
f38ac5fbac improved comments 2006-08-25 15:42:37 +00:00
Brian Paul
3c54e8376d Rename _mesa_append_modelview_code() to _mesa_insert_mvp_code().
The four DP4 instructions are now inserted at the top of the program
instead of appended to tail.
2006-08-25 15:15:24 +00:00
Brian Paul
383c39e58e use _mesa_alloc_instructions() 2006-08-25 15:14:25 +00:00
Brian Paul
9983a27cbe added _mesa_alloc_instructions() utility function 2006-08-25 15:13:25 +00:00
Ian Romanick
a574c804a0 Add missing enums for GL_SGI_color_table. 2006-08-25 00:56:34 +00:00
Brian Paul
e53e0f47d0 recent bug fixes 2006-08-24 23:37:36 +00:00
Brian Paul
6211a14137 update MAX_INSTRUCTIONS limit 2006-08-24 23:37:13 +00:00
Brian Paul
ebf58ea3a3 According to GL_NV_fragment_program, max frag prog length is 1024 instructions.
Updated MAX_NV_FRAGMENT_PROGRAM_INSTRUCTIONS to 1024.
2006-08-24 23:28:01 +00:00
Brian Paul
77427a1e52 Cg tries to bind NV fragment programs to the GL_FRAGMENT_PROGRAM_ARB target
with glBindProgramARB().  I guess the GL_ARB_fragment_program specification
allows that, but Mesa didn't.
Relaxed the check with a new predicate function: compatible_program_targets().
2006-08-24 23:11:39 +00:00
Brian Paul
e6940f0a33 scalar sources such as 'time.x' weren't accepted by parser 2006-08-24 23:08:01 +00:00
Brian Paul
c6511ab950 Functions for vertex/fragment program transformations, optimizations, etc. 2006-08-24 22:11:40 +00:00
Brian Paul
beb32c4a59 fix bad casts, carry over r200 fix to check for null program string in r300_translate_vertex_shader() 2006-08-24 22:05:35 +00:00
Brian Paul
94ff996cae Check for NULL program string in r200_translate_vertex_program().
Fixes bug reported by Chris Rankin.
Added some new comments.
2006-08-24 22:03:38 +00:00
Brian Paul
a75439093c use _mesa_realloc_instructions() 2006-08-24 21:58:32 +00:00
Brian Paul
3b9b8de9b0 Added _mesa_realloc_instructions() utility function.
Fixed/updated comments for parameter list functions.
2006-08-24 21:57:36 +00:00
Ian Romanick
a5f2206077 GL_EXT_paletted_texture functions should alias GL_SGI_color_table functions.
The functions for GL_EXT_paletted_texture that do not share GLX
protocol with GL_ARB_imaging are supposed to alias the similar
functions from GL_SGI_color_table.  They didn't.  This patch corrects
this problem and enables GLX protocol for both extensions.

Since this removes 3 entries from the dispatch table, this change
creates a lot of changes in the generated files.
2006-08-24 21:42:38 +00:00
Ian Romanick
bf83e652f6 Add a new offset mode to the GL API XML. This mode, called "assign,"
tells the scripts to assign an available offset to the function.  The
important changes are in src/mesa/glapi/gl_XML.py and
src/mesa/glapi/*.xml.

Since the DRI drivers only depend on functions required by the ABI
(e.g., GL 1.2 + ARB_multitexture) having fixed offsets, all functions
not in the ABI use "assign" mode.  This has caused the offset of
basically every function outside the ABI to change.  I have verified
that a libGL with this patch works with a DRI driver without the patch.

Futher, several function were removed from the dispatch tables
altogether.  These are the functions for the following extensions:

	GL_SGIS_texture_filter4
	GL_SGIS_texture4D
	GL_SGIS_detail_texture
	GL_SGIS_sharpen_texture
	GL_SGIX_sprite
	GL_SGIX_instruments
	GL_SGIX_framezoom
	GL_SGIX_tag_sample_buffer
	GL_SGIX_reference_plane
	GL_SGIX_flush_raster
	GL_SGIX_list_priority
	GL_SGIX_fragment_lighting
	GL_PGI_misc_hints
	GL_EXT_index_material
	GL_EXT_index_func
	GL_3DFX_tbuffer

This removes 50 functions from the dispatch table.
2006-08-24 20:14:45 +00:00
Brian Paul
5947f8fd63 fix fragment.position initialization bug 2006-08-24 19:06:02 +00:00
Ian Romanick
ce9767f863 Make sure that _GNU_SOURCE is enabled in the linux configs that set
HAVE_POSIX_MEMALIGN.  This eliminates a compiler warning.  Also,
clean up some crufty linux-sparc* configs.
2006-08-24 18:06:37 +00:00
Keith Whitwell
39f222a421 add point-position.c 2006-08-24 17:49:37 +00:00
Keith Whitwell
28536e6c4f Test for fragment.position in points primitives. Currently renders
incorrectly on software mesa.
2006-08-24 17:48:53 +00:00
Brian Paul
83304326c8 added glut/mini/ sources to glut tarball 2006-08-24 17:01:35 +00:00
Brian Paul
116411d5f0 Check if mesa_vp->Base.Parameters is null before dereferencing (bug report
from Chris Rankin).
Also, fix some bad casts.
2006-08-24 15:57:12 +00:00
Ian Romanick
4169c220bd Fix some problems with the generation of the size tables. Enable
generation of protocol tables for Render.
2006-08-24 00:26:47 +00:00
Brian Paul
a95d5f0f58 silence warning 2006-08-23 23:18:39 +00:00
Brian Paul
4d12a05e6c Added _mesa_lookup_program() and _mesa_lookup_bufferobj() functions to avoid
a lot of casting elsewhere.
Use _mesa_lookup_texture() in tdfx driver, use _mesa_lookup_bufferobj() in r300
driver.
2006-08-23 23:10:14 +00:00
Ian Romanick
261a806f9e New script and API description file to enable generate of GLX protocol
decode tables in the server.
2006-08-23 20:32:48 +00:00
Brian Paul
d21ccb49c0 update glut fbdev sources list 2006-08-23 19:46:17 +00:00
Sean D'Epagnier
bd3e6ec066 VT switching now uses correct keys.
exiting when virtual screen size is larger than regular size doesn't corrupt screen.
colormap is reset when using stdin input on exit.
return is not reported as ctrl-m but '\r' as it should be
backspace keycode was incorrect and not working, fixed
2006-08-23 07:55:48 +00:00
Aapo Tahkola
43c9587ed4 remove duplicate pieces of code. 2006-08-22 22:27:32 +00:00
Aapo Tahkola
cafb0617ea extend some DrawRangeElements cases to support rendering more than 65535 verts in one blast. ut2k4 cases in other words ... 2006-08-22 21:54:50 +00:00
Aapo Tahkola
50eae3af7a fix broken write-only depth setting. use early z where possible. 2006-08-22 21:05:37 +00:00
Ian Romanick
723db7212c Correct the name of the GL_NV_texture_expand_normal extension. 2006-08-22 18:44:58 +00:00
Ian Romanick
d319edff1e The TLS dispatch functions for x86-64 are fixed-size, just like on
x86.  This means that the position of each dispatch function can be
calculated as (dispatch_offset * size_of_function) + glNewList.  This
allows us to not store the function pointers in glprocs_table_t.

This same optimization has been done for quite some time on x86.  We
could probably also do this for some cases of the SPARC dispatch as
well.
2006-08-22 18:22:20 +00:00
Ian Romanick
4e4b5f4008 Add new attribute called static_dispatch to the <function> element. This
boolean attribute, which defaults to true, determines whether or not a
static dispatch function is available in libGL for applications to link
against.

Ideally, any new functions that are not part of the ABI should not have
directly accessable dispatch functions.  This forces applications to use
glXGetProcAddress to access these functions.  By doing this we can
gracefully remove functions from libGL without breaking the linkage of
applications.

Note that the static dispatch functions are still generated.  However, they
are given names like gl_dispatch_stub_820 and are marked with the "hidden"
linker attribute.

All extension functions added since the previous Mesa release (6.5) have
been marked as 'static_dispatch="false"'.
2006-08-22 16:34:38 +00:00
Brian Paul
6423ec9145 move ALL_SOURCES to sources file 2006-08-21 16:05:30 +00:00
Brian Paul
b20814fd7d remove FBDEV_DRIVER_OBJECTS assignment (in sources file) 2006-08-21 15:50:41 +00:00
Brian Paul
d5299bf9a1 various updates 2006-08-21 14:26:06 +00:00
Michal Krol
1d67cad9af More GLSL preprocessor code:
Rename slang_version.syn to slang_pp_version.syn.
The #version directive understands version 120.
Cosmetic changes in version preprocessor.
Checks if requested version is supported by the compiler.
2006-08-21 09:25:11 +00:00
Michal Krol
798ef5ce33 GLSL 1.20 constructors and operators. 2006-08-21 08:47:28 +00:00
Roland Scheidegger
bd4c8ec0ec remove the now confusing option to manually enable software ARB_vp if drm is not new enough on r200 2006-08-19 08:54:03 +00:00
Sean D'Epagnier
c6fc823987 Removed ifeq from makefile, and corrected fbdev driver so it compiles 2006-08-19 00:28:36 +00:00
Brian Paul
cf4d2f7109 updates for 6.5.1 2006-08-18 20:24:54 +00:00
Brian Paul
92c43b110c Fix-ups for linux-fbdev config. No longer build Xlib driver sources. 2006-08-18 20:20:28 +00:00
Sean D'Epagnier
7e4152f0ed The driver now compiles correctly without any x headers or libraries installed
The bitmap and stroke code can't be shared with glx anymore because of this.

The model for the mini teapot is restored and I have tested it to work with
linux-fbdev and linux-solo

The driver recognizes 32bpp where there is no alpha (my radeon 7500)  It also
sets the correct number of cmap entrees (instead of 256 which can be an error)
2006-08-18 10:38:15 +00:00
Alan Hourihane
bd87c303e9 Fix writemasks on texture arb fp instructions.
Cleanup invarient state emission.
2006-08-18 09:04:48 +00:00
Brian Paul
c1c282f36a sort the FEATURE_ defines 2006-08-17 14:27:10 +00:00
Brian Paul
9dc90cd5f3 added FEATURE_EXT_timer_query and tests 2006-08-17 14:25:04 +00:00
Brian Paul
5928718475 change #ifdef to #if 2006-08-17 14:16:03 +00:00
Brian Paul
6206aec90a change tex memory allocation calls (debian bug 383209) 2006-08-16 20:53:39 +00:00
Ian Romanick
a7d0256745 When available, which is most of the time, use posix_memalign to implement
_mesa_align_malloc and friends.
2006-08-16 17:06:08 +00:00
Ian Romanick
ab6cf9dd62 Enable support for GL_EXT_gpu_program_parameters for R300. 2006-08-15 16:48:06 +00:00
Ian Romanick
8c41c757fe Add support for GL_EXT_gpu_program_parameters. Any driver that enables
either GL_ARB_vertex_program or GL_ARB_fragment_program should enable this
extension as well.
2006-08-15 16:47:34 +00:00
Ian Romanick
5208d93a41 Add test for GL_EXT_gpu_program_parameters. 2006-08-15 16:44:32 +00:00
Ian Romanick
daea717634 Remove extraneous trailing semicolon. 2006-08-15 16:26:34 +00:00
Brian Paul
37b5b01217 s/GLvoid/void/ to fix gcc 4.2 issue (bug 7875) 2006-08-15 14:28:03 +00:00
Michel Dänzer
061a3fe340 Bug #7169: Attempt to make libGL symbols visible to drivers.
Some applications end up dlopening libGL without RTLD_GLOBAL, so the libGL
symbols referenced by the driver can't be unresolved when libGL dlopens it.
This attempts to make the libGL symbols visible to the driver by dlopening
libGL (again) with RTLD_GLOBAL before dlopening the driver and dlclosing
the obtained handle afterwards.
2006-08-14 15:53:37 +00:00
Aapo Tahkola
24cd8e22f5 gcc-4.1.1 compile fix 2006-08-12 13:31:15 +00:00
Ian Romanick
357addfc45 Add comments explaining a couple "mystery" bits. 2006-08-12 00:11:05 +00:00
Ian Romanick
32a9e9be0c Fix white-space problem in the prototype for glBlitFramebufferEXT that
prevented gl_mangle.h from picking it up.
2006-08-12 00:05:54 +00:00
Ian Romanick
8fbe16d4dd Fix long standing bug that prevented newer drivers from working with
older libGL.  The data in extension_helper.h erroneous instructed
drivers to expect all functions with establised offsets, even those
not in the ABI, to have a specific offset allocated.  This is just
wrong.  A function is either in the ABI and has a set offset or a
function is not in the ABI and has a re-map offset.
2006-08-11 23:56:37 +00:00
Ian Romanick
56f349515c Convert comment header for __GLcontextModesRec to Doxygen style. 2006-08-11 22:26:49 +00:00
Aapo Tahkola
8ff5e37f58 support shorts as vertex data 2006-08-11 13:59:37 +00:00
Eric Anholt
2332812644 Add padding to match the current xf86-video-intel DDX->DRI interface. 2006-08-10 21:26:50 +00:00
Adam Jackson
3775b566fa mkdir -> mkdir -p, since /usr/include might not exist in the installroot yet 2006-08-10 20:24:50 +00:00
Adam Jackson
be85fde82b linux-indirect target fixes. 2006-08-10 20:19:57 +00:00
Brian Paul
b7a661cf8c 6.5.1 relnotes 2006-08-10 14:57:24 +00:00
Brian Paul
795e83f809 latest updates for 6.5.1 2006-08-10 14:54:19 +00:00
Alan Hourihane
a89b099c74 Fixup more PROGRAM_UNDEFINED problems. 2006-08-10 13:14:24 +00:00
Alan Hourihane
8d97265711 Fix some breakage after the PROGRAM_UNDEFINED change 2006-08-10 13:12:00 +00:00
Sean D'Epagnier
7196cddb3a Added initial multisampling support to glfbdev driver.
Fully implemented glutGameMode, and added vidresize stubs to make
Added support for glutReshapeDisplay to change video mode but not lose
current mesa context.
implementation glut 5 complient.
Fixed many minor bugs
Updated docs
2006-08-10 10:21:17 +00:00
Brian Paul
54e15d6585 finish up texstore for SL8 texture format 2006-08-10 04:14:05 +00:00
Michal Krol
7ba08ac45a GLSL 1.20 built-in library. 2006-08-09 21:22:59 +00:00
Michal Krol
edefc658e4 More GLSL code - more support for vec4 operations on x86 back-end. 2006-08-09 20:05:26 +00:00
Eric Anholt
9f344b3e7d Add Intel i965G/Q DRI driver.
This driver comes from Tungsten Graphics, with a few further modifications by
Intel.
2006-08-09 19:14:05 +00:00
Eric Anholt
7b52bed987 Add PROGRAM_FILE_MAX for i965 driver.
While here, make PROGRAM_UNDEFINED just the next value in the enum.
2006-08-09 19:10:23 +00:00
Brian Paul
46f20579a2 implement some of the sRGB texstore functions 2006-08-09 02:42:25 +00:00
Brian Paul
4b1e6a4b58 remove stray text from previous check-in 2006-08-07 14:09:13 +00:00
Sean D'Epagnier
6545ebbd8d Modified config to use glut/fbdev, added demo and sample directories. 2006-08-05 08:55:10 +00:00
Sean D'Epagnier
288d4b6ebe Modularized code into multiple files.
Added gamemode stubs, iconify support, joystick stubs.

Fixed color index mode, added 8 bit alpha blending, enabled cmaps even
with 15, 16, 24, and 32 depths as some fbdev drivers need this.

Fixed compiling with -ansi

Using SIGIO for keyboard input, so that vt switching is enabled even
if the program is locked.

Fixed numerous small bugs.
2006-08-05 08:24:29 +00:00
Brian Paul
0606ad45f6 fix typo, indentation 2006-08-04 22:09:43 +00:00
Karl Schultz
4818b0bea1 export new _mesa_* functions 2006-08-04 19:45:29 +00:00
Brian Paul
5c488dcab2 fix bug when pushing ReadBuffer state for GL_PIXEL_MODE_BIT 2006-08-04 13:41:25 +00:00
Claudio Ciccani
21dc092324 Handle GLUT_DEVICE_KEY_REPEAT,GLUT_OWN_JOYSTICK,GLUT_JOYSTICK_POLL_RATE in glutDeviceGet(). 2006-08-04 12:43:33 +00:00
Claudio Ciccani
3ab2dd9f91 Moved glutDeviceGet() to events.c.
Implemented glutIgnoreKeyRepeat() and glutSetKeyRepeat().
2006-08-04 10:49:43 +00:00
Brian Paul
0a4be70368 more work for GL_EXT_texture_sRGB. 2006-08-04 03:44:53 +00:00
Brian Paul
2eb00b4388 use WRITE_MASK_* instead of 0x1, 0x2, etc 2006-08-03 17:10:45 +00:00
Brian Paul
3163542841 Added a check to prevent rebuilding Mesa with a different configuration
without first doing 'make realclean'.
2006-08-03 16:58:06 +00:00
Brian Paul
9c3876d7d8 New wrapper functions: _mesa_dlopen(), _mesa_dlsym(), _mesa_dlclose().
Eventually move them into imports.c
2006-08-03 03:59:20 +00:00
Brian Paul
6c071592ab added GL_EXT_texture_sRGB 2006-08-03 03:23:05 +00:00
Brian Paul
8d214bc804 Initial work for GL_EXT_texture_sRGB. 2006-08-03 03:20:52 +00:00
Brian Paul
35fe7cfae4 fix link for Aqsis 2006-08-02 21:26:15 +00:00
Michal Krol
b60a3da43f Enable vec4 extension for x86 back-end. 2006-08-02 14:51:24 +00:00
Michal Krol
1616f5b621 Change fragment shader to utilize faster vec4 operations. 2006-08-02 14:46:50 +00:00
Michal Krol
7a70391575 Add test for vec4 extension. 2006-08-02 14:45:24 +00:00
Michal Krol
3b5e02cc7c Add vec4 extension. 2006-08-02 14:44:46 +00:00
Michal Krol
60ba2d88b3 Fix mmFindBlock function. 2006-08-02 14:22:06 +00:00
Michal Krol
365582dd6f Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492. 2006-08-01 20:07:31 +00:00
Brian Paul
cc738e004f casts and assertions 2006-08-01 20:03:29 +00:00
Brian Paul
f05e7eba95 code to draw engine block 2006-08-01 20:03:05 +00:00
Michal Krol
90d7b9c9eb Move GL_MESA_shader_debug from glext.h to gl.h. 2006-08-01 16:06:08 +00:00
Brian Paul
e724324894 renderbuffer fixes (Sean D'Epagnier) 2006-08-01 14:33:05 +00:00
Claudio Ciccani
9a4f15ee59 Fixed warnings. 2006-08-01 14:32:02 +00:00
Aapo Tahkola
689df543db fix #6991 2006-07-31 23:21:50 +00:00
Brian Paul
667dd3c3e8 added glut fbdev files 2006-07-31 14:25:53 +00:00
Brian Paul
fe3242f00a GLUT on fbdev driver. Sean D'Epagnier 2006-07-31 14:24:21 +00:00
Michal Krol
e8947a5fa0 Add support for GL_MESA_shader_debug. 2006-07-30 15:29:11 +00:00
Michal Krol
91dbc04d5e Commit enums for GL_MESA_shader_debug.spec. 2006-07-30 15:19:19 +00:00
Michal Krol
32bf274f78 Program to convert .syn file to .h headers. 2006-07-30 14:48:01 +00:00
Claudio Ciccani
fc434622b3 Clear window's event mask before enabling handled events. 2006-07-30 14:47:51 +00:00
Michal Krol
4cc87c7248 Add support for GL_MESA_shader_debug. 2006-07-30 14:45:25 +00:00
Michal Krol
c26999fd2c Fix dependencies. 2006-07-30 14:33:53 +00:00
Michal Krol
d2ac9ab6ee More text. 2006-07-30 14:28:38 +00:00
Michal Krol
39dd5196e6 Optimize shaders.
Use frame counter.
2006-07-29 09:42:03 +00:00
Eric Anholt
0e6ef1b1cd Fix build failure in the savage driver. 2006-07-28 21:30:14 +00:00
Jerome Glisse
32d61d0616 r300_emit.h cleanup.
Remove unused macro
Replace LOCAL_VAR, PREFIX*
Indent code
Remove radeon redundant CP type 3 packet
2006-07-27 22:51:14 +00:00
Brian Paul
a7722cb794 load SLANG_FRAGMENT_FIXED_SECONDARYCOLOR 2006-07-21 20:52:43 +00:00
Brian Paul
c28399baa7 just reindent 2006-07-21 20:49:20 +00:00
Brian Paul
a97492f4df added arrayobj.[ch] files 2006-07-21 19:56:52 +00:00
Brian Paul
9d9d7b1dee check for non-nill pwc in WMesaMakeCurrent(), bug 7585 2006-07-21 19:52:59 +00:00
Brian Paul
122629f279 Some structure renaming. Prefix vertex/fragment-related structs with
"gl_" to match other structs.
2006-07-20 16:49:57 +00:00
Brian Paul
459db7bd72 bump MESA_TINY to 1 2006-07-20 04:34:36 +00:00
Brian Paul
a623e008c6 move/update comments 2006-07-20 04:24:42 +00:00
Brian Paul
2f12458fb3 use ctx->Light.ShadeModel instead of ctx->_TriangleCaps 2006-07-20 04:17:11 +00:00
Brian Paul
a1a6ac4af4 Instead of testing ctx->_TriangleCaps for flat/smooth shading, just use ctx->Light.ShadeModel 2006-07-20 04:16:26 +00:00
Brian Paul
4e2de9531e remove unused NEED_TWO_SIDED_LIGHTING() macro 2006-07-20 03:56:16 +00:00
Brian Paul
ad15866ef0 For glGetTexImage(), move the _mesa_validate_pbo_access() error check into
_mesa_GetTexImage() so it's not needed in the fallback or driver functions.
2006-07-19 16:13:15 +00:00
Brian Paul
0749e2723b Several loops over the map1/2 evaluator arrays were incorrect.
There's only 16 evaluator maps.  Define new _TNL_NUM_EVAL constant for
those loops.
Also, fix priority of GL_NV_vertex_program generic maps - they override the
conventional maps.
See bug 7564.
2006-07-19 15:28:29 +00:00
Brian Paul
69ddf6cc41 more 6.5.1 additions 2006-07-19 15:09:42 +00:00
Brian Paul
114ecb9d67 indentation fix 2006-07-18 22:33:14 +00:00
Brian Paul
df926955be add missing 'return' after a few _mesa_error() calls in _mesa_GetTexImage() 2006-07-18 22:27:02 +00:00
Brian Paul
813e56db51 Compute ctx->Color._LogicOpEnabled in one place instead of four places! 2006-07-18 19:15:40 +00:00
Tilman Sauerbeck
f81b1dbe37 fix a memleak (that code block has been commented out for years for unknown reasons) 2006-07-15 12:09:27 +00:00
Rune Petersen
416ac254c2 A small logic error.
We need to call do_swizzle() when the scaler _or_ vector unit have a
swizzle other 000/ZERO/111/ONE.

This ensures that the gloss on banners in ut2004 is not angel-dependent
(since when was banners glossy?).
2006-07-15 10:44:25 +00:00
Brian Paul
f4e46e1a46 define FLT_MAX_EXP to 128 if undefined 2006-07-13 20:21:44 +00:00
Ian Romanick
7ef4a07165 Move initialization of server_support from __glXProcessServerString to
__glXCalcualteUsableExtensions.  By having both callers of
__glXProcessServerString initialize the bit-fields passed in, we guarantee
that the correct amount of data is initialized:

This fixes bugzilla #7353.
2006-07-13 15:27:37 +00:00
Brian Paul
883f9891cb LIB_DIR is now just 'lib' or 'lib64'
Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets.
Patch by Hanno Böck.
2006-07-13 02:50:27 +00:00
Brian Paul
d9eff8ba19 download/install updates 2006-07-12 20:14:43 +00:00
Brian Paul
b8528ea55e New config var DRI_DRIVER_SEARCH_DIR to specify where libGL should search
(at runtime) for the DRI drivers.
See bug 2372.
2006-07-12 19:40:59 +00:00
Tilman Sauerbeck
e5c28321b2 fix another memleak 2006-07-12 17:06:49 +00:00
Tilman Sauerbeck
e77875dcbe fix a memleak 2006-07-12 16:49:07 +00:00
Brian Paul
59cfd3cd3f destroy window upon exit, remove CVS log comment 2006-07-12 02:34:43 +00:00
Brian Paul
d8bb5ea967 call glutDestroyWindow() to allow checking for mem leaks upon exit 2006-07-12 02:32:21 +00:00
Brian Paul
c04bb519e1 free array objects properly (bug 7493) 2006-07-11 21:56:43 +00:00
Tilman Sauerbeck
c60bcc8966 free GL2Objects unconditionally 2006-07-11 20:13:28 +00:00
Tilman Sauerbeck
c0eb777cd8 free the ArrayObjects hash table 2006-07-11 19:36:27 +00:00
Tilman Sauerbeck
17b5063c6f only access ss->BufferObjects if it's declared 2006-07-11 19:03:21 +00:00
Tilman Sauerbeck
aead688e7f _mesa_destroy_context() frees radeon->glCtx so we must not access it afterwards 2006-07-11 18:35:24 +00:00
Thomas Hellström
bbe197ec1d Revert the SiS and Unichrome DRM version check changes. 2006-07-11 14:56:20 +00:00
Thomas Hellström
85b4ae0654 The SiS and Unichrome drivers assume that the handle to the
AGP map is equivalent to the AGP physical address. Fix this.
2006-07-10 12:20:24 +00:00
Aapo Tahkola
b9920ba7b7 Fix #7195 2006-07-09 00:04:06 +00:00
Brian Paul
27908d2bcb update comment, APP_LIB_DEPS 2006-07-07 14:32:47 +00:00
Brian Paul
04f43226a8 fixup OSMESA_LIBS and make clean target 2006-07-07 14:32:02 +00:00
Brian Paul
8c140c9c37 remove GLUT dependency 2006-07-07 14:31:28 +00:00
Brian Paul
3ae1905744 remove dependency on GLUT 2006-07-07 14:12:04 +00:00
Kristian Høgsberg
218ba1ff54 Don't include unused header files. 2006-07-06 07:28:25 +00:00
Aapo Tahkola
5906acad08 R300_RR_ROUTE_1 still needs to be initialized. 2006-07-05 13:28:01 +00:00
Brian Paul
1ff8daf21e New animated engine demo. 2006-07-04 21:43:21 +00:00
Jerome Glisse
1ad914575a Add R300_VAP_CNTL 0x2140 and cosmetic cleanup. 2006-07-04 20:50:49 +00:00
Brian Paul
525eb0b621 added linux-osmesa 2006-07-04 16:49:58 +00:00
Brian Paul
f385cf115a simple libOSMesa.so-only config, no X 2006-07-04 16:49:41 +00:00
Brian Paul
c6e1784062 enable hw antialiasing (Martijn van Oosterhout) 2006-07-04 13:37:19 +00:00
Brian Paul
2922aa236f fix linking bug (bug 7405) 2006-07-03 23:12:16 +00:00
Brian Paul
77afb43519 additional clipping/viewport fixes (Martijn van Oosterhout) 2006-07-03 23:08:33 +00:00
Roland Scheidegger
46c1419c93 some minor simplifications (same as in r300 driver) since mesa's internally used swizzle and writemask flags are identical to the bits used on the hardware, use a macro to error out if these assumptions are no longer true. 2006-07-03 22:14:54 +00:00
Roland Scheidegger
bf35d70635 check if radeon_drm.h from libdrm is new enough, otherwise print an error to make it easier to figure out why it won't compile... 2006-07-03 22:11:44 +00:00
Jerome Glisse
69f31f5475 Add copyright header and minor cleanup. 2006-07-03 21:35:07 +00:00
Brian Paul
bfb2729f9e disable a new mem leak check until we're sure it's valid 2006-07-03 13:20:32 +00:00
Brian Paul
a6c72b67f6 fix clipping bug on context change (Martijn van Oosterhout) 2006-07-03 13:17:00 +00:00
Tilman Sauerbeck
527cd2544f initialize offset to avoid bogus warnings from valgrind 2006-07-01 21:27:34 +00:00
Brian Paul
be9282bf0b Vertex/fragment program patches (Rune Petersen) 2006-06-30 17:56:50 +00:00
Brian Paul
0cdf2d7413 clipping fixes (Martijn van Oosterhout) 2006-06-30 17:21:32 +00:00
Brian Paul
f63623779a clean-ups 2006-06-30 16:55:39 +00:00
Brian Paul
2893072967 use _mesa_HashDeleteAll() 2006-06-30 15:58:53 +00:00
Brian Paul
66c9be06f9 remove occlude.c demo since GL_HP_occlusion_test no longer available 2006-06-30 15:57:05 +00:00
Brian Paul
c7e164f091 In free_shared_state(), use new _mesa_HashDeleteAll() function to delete
textures, display lists, programs, VBOs, etc.  Less code and more efficient.
2006-06-30 15:44:30 +00:00
Brian Paul
d179e16501 Added _mesa_delete_list() to delete a display list, but don't remove from
hash table.  Make _mesa_destroy_list() static.
2006-06-30 15:41:55 +00:00
Brian Paul
9f6798d6e1 Added _mesa_HashDeleteAll() to delete all entries in a hash table with a
callback function.
Added _mesa_HashWalk() to walk over all entries in a hash table with callback.
2006-06-30 15:39:23 +00:00
Jerome Glisse
7c583f5d11 Fix typo. 2006-06-29 20:01:35 +00:00
Tilman Sauerbeck
f7f5b2c415 destroy left-over VBOs on shutdown 2006-06-29 18:36:51 +00:00
Tilman Sauerbeck
ff3a5b1842 instead of messing with _TNL_LAST_GENERIC and _TNL_FIRST_GENERIC, use _TNL_NUM_GENERIC. this fixes an off-by-one error (we didn't handle the final attribute) 2006-06-29 16:48:45 +00:00
Tilman Sauerbeck
8ca6250d72 cleanup, avoid magic values 2006-06-29 16:47:09 +00:00
Tilman Sauerbeck
ff5b590382 added _TNL_NUM_GENERIC 2006-06-29 16:45:57 +00:00
Brian Paul
787f4965a2 only assert front/back pitch if double-buffered (bug 7663) 2006-06-29 15:44:13 +00:00
Brian Paul
b10ea9843b added src/glx/x11/depend to DEPEND_FILES 2006-06-28 21:58:47 +00:00
Tilman Sauerbeck
6c33475424 propagate errors from parse_generic_attrib_num in parse_attrib_binding (-> don't segfault when you're trying to access invalid generic attributes 2006-06-28 16:26:20 +00:00
Brian Paul
7a7aa2aabb Don't use nested struct definitions in tnl_clipspace_fastpath.
Make attr_type into a top-level type: tnl_attr_type
See bug 7340.
2006-06-27 20:11:00 +00:00
Ian Romanick
4063b1730d Remove the extraneous GL_ prefix from the enums for GL_EXT_timer_query and
GL_EXT_framebuffer_blit.  Enumerants in the XML schema get the GL_ prefix
added to them automatically.  This resulted in things like
"GL_GL_TIME_ELAPSED_EXT" in enums.c.
2006-06-27 16:13:13 +00:00
Aapo Tahkola
291fd257eb Fix stencil clears that have caused problems with redbook/stencil, tests/stencilwrap and ut2k4 adrenaline pills. 2006-06-27 01:46:11 +00:00
Aapo Tahkola
caf0176472 Fix generic vertex attribs (Rune Petersen) 2006-06-27 01:26:47 +00:00
Brian Paul
4e0617849c use trackball code for mouse rotation 2006-06-26 23:00:15 +00:00
Brian Paul
9671548424 virtual trackball code 2006-06-26 22:59:28 +00:00
Brian Paul
199729ff27 locking fixes (Martijn Van Oosterhout) 2006-06-26 19:59:38 +00:00
Brian Paul
78a6000cf2 Use $(LIB_DIR) instead of $(TOP)/lib since libraries sometimes go into lib64/.
Probably need to fix the install destinations too...
2006-06-26 15:34:21 +00:00
Tilman Sauerbeck
0deb088cf0 more cleanups 2006-06-23 16:47:08 +00:00
Brian Paul
3cb56804ca fix glut/freeglut links 2006-06-23 15:27:32 +00:00
Brian Paul
0e794a1bc6 New 'install' targets in makefile. See bug 2372. 2006-06-22 22:50:48 +00:00
Keith Whitwell
b4517527eb A bunch of tiny tests that I've found helpful bringing up drivers from
scratch.  These exercise single pieces of functionality and provide a
gentler ramp than trying to use the mesa demos to bring up drivers with.
2006-06-22 16:32:19 +00:00
Keith Whitwell
5fb9f80e37 exercise min/max lod 2006-06-21 14:04:04 +00:00
Keith Whitwell
942b5b7bc0 exercise position invarient vertex program 2006-06-21 14:03:39 +00:00
Alan Hourihane
feb0ff11e5 Check for a valid context 2006-06-21 10:58:04 +00:00
Brian Paul
4cd9e5c3c9 rewrite gluErrorString() to be more legible 2006-06-20 15:30:26 +00:00
Brian Paul
bd0bfd1dc2 reorder a few token definitions 2006-06-20 14:52:22 +00:00
Michel Dänzer
c28834bfbb Add M32R architecture to test for USE_IEEE and friends (Kazuhiro Inaoka,
from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=374608).
2006-06-20 09:39:32 +00:00
Brian Paul
1ec9ed4f25 fix span code compilation problems, bug 5858 2006-06-20 03:35:17 +00:00
Ian Romanick
4afcd8aa8b Print the hex value of the errant input when an invalid stencil function is
specified.
2006-06-19 16:39:49 +00:00
Alan Hourihane
161de10ce8 If DrawBuffer isn't set, return immediately 2006-06-19 09:27:04 +00:00
Tilman Sauerbeck
11fceb19d3 no need to handle ARL in a special way, it's a generic scalar operation. only tested on r300. 2006-06-18 14:07:10 +00:00
Aapo Tahkola
16d1024f27 fix broken negate 2006-06-18 12:50:27 +00:00
Aapo Tahkola
e6a17b6052 fix broken address register reads 2006-06-18 12:39:58 +00:00
Brian Paul
385f23edf9 Thread safety for Win32. SourceForge bug #1507315. 2006-06-16 14:50:05 +00:00
Brian Paul
c0168fabed glPush/PopAttrib fix (bug 6891) 2006-06-16 13:45:29 +00:00
Brian Paul
65897c04c8 don't create include/GLES yet 2006-06-16 13:41:05 +00:00
Brian Paul
c97c5f0b6b remove obsolete PointSizePtr 2006-06-16 13:40:06 +00:00
Jouk Jansen
c3c64383ca OpenVMS compile support update
Modified Files:
 	Mesa/src/mesa/main/descrip.mms
 ----------------------------------------------------------------------
2006-06-16 13:14:35 +00:00
Brian Paul
be906fe05e added some comments, braces in _mesa_BindTexture 2006-06-15 15:39:10 +00:00
Brian Paul
2d77b25c27 minor clean-ups 2006-06-15 15:36:06 +00:00
Brian Paul
9960ddcd66 comments for gl_array_object struct 2006-06-15 15:34:13 +00:00
Keith Whitwell
0b994ef589 Call _mesa_resize_framebuffer() within intelWindowMoved(). Fixes
googleearth glitches.
2006-06-15 12:47:29 +00:00
Keith Whitwell
d048b7d36e Protect _swrast_read_rgba_span with RENDER_START/FINISH 2006-06-14 10:48:09 +00:00
Brian Paul
4f68411e77 s/ATTRIBUTE/GENERIC/ 2006-06-14 04:15:16 +00:00
Brian Paul
62e1fae858 A number of vertex buffer fields like NormalPtr, FogCoordPtr, etc are really
just aliases for members of the VB->AttribPtr[] array.
Begin replacing FogCoordPtr with VB->AttribPtr[_TNL_ATTRIB_FOG], and similarly
for NormalPtr, TexCoordPtr, PointSizePtr, etc.
2006-06-14 04:05:17 +00:00
Brian Paul
62dc134771 Rename _TNL_ATTRIB_ATTRIBUTE* to _TNL_ATTRIB_GENERIC* 2006-06-14 03:30:57 +00:00
Brian Paul
3c18d49607 new assertion 2006-06-14 03:29:08 +00:00
Brian Paul
ee06106082 Do a cheesy implementation of glXWait/GetVideoSyncSGI() functions, but
disable reporting the GLX_SGI_video_sync extension anyway.
Google Earth works now.
2006-06-13 23:06:25 +00:00
Brian Paul
2d087480b4 GLX_BAD_CONTEXT checks in video-sync functions 2006-06-13 23:04:41 +00:00
Brian Paul
e49aea9cef remove debug printf 2006-06-13 22:17:41 +00:00
Brian Paul
f9d88c8204 clean-ups and new comments 2006-06-13 17:24:36 +00:00
Brian Paul
4df010b296 fix glVertexAttribPointerARB's normalized behaviour 2006-06-13 17:17:32 +00:00
Brian Paul
34a3779aae remove unused index_attr1fv() 2006-06-13 17:16:56 +00:00
Brian Paul
7dfdf3a5b7 Rename some functions/macros to better reflect their behaviour:
3F -> 3FN because integer types are normalized
4FC -> 3FN because we can normalize non-color attributes
2006-06-13 17:13:15 +00:00
Brian Paul
44b82dffe8 In import_attrib(), use the from->Normalized flag to choose the right
translation function.
Before this fix the 'normalized' flag to glVertexAttribPointerARB() was ignored.
2006-06-13 17:06:44 +00:00
Brian Paul
5c7c5a762e s/0/NULL/ 2006-06-13 17:04:26 +00:00
Brian Paul
1c546ae552 When using an ARB vertex program, the generic vertex arrays do not alias the
conventional arrays.
Typo: s/writeable/writable/
2006-06-13 17:03:25 +00:00
Brian Paul
8bc00c2047 fix size assertions in _mesa_init_teximage_fields() 2006-06-13 16:45:28 +00:00
Brian Paul
212d7e8369 minor simplification in texcoord array import 2006-06-13 14:50:44 +00:00
Michel Dänzer
73e73ffdd5 Fix command line parsing. 2006-06-13 08:37:03 +00:00
Brian Paul
bd1e587ebe remove some unneeded #includes 2006-06-13 03:29:02 +00:00
Brian Paul
0395cc01fd Fix a few conversion bugs. For example, GLshort->GLfloat conversion
didn't work for color arrays.
2006-06-13 03:22:52 +00:00
Kristian Høgsberg
c25eb99f95 Fix all instances of calling __glXSetupForCommand before GetReqExtra. 2006-06-13 01:41:18 +00:00
Brian Paul
18d0efb555 removed incorrect const qualifier 2006-06-13 01:14:48 +00:00
Ian Romanick
9853aac495 Make r300 driver build with GL_APPLE_vertex_array_object changes.
Sorry for the breakage.  These changes are only build tested.
2006-06-12 22:39:49 +00:00
Brian Paul
a3feff414f GL_APPLE_vertex_array_object is new 2006-06-12 20:02:45 +00:00
Brian Paul
48c03d7c9f s/buffer/arrays/ 2006-06-12 20:02:11 +00:00
Brian Paul
d2fb24a671 make do_vertex_attrib_enable() static 2006-06-12 19:59:34 +00:00
Brian Paul
f2ce358331 include glxclient.h to silence missing prototypes warning 2006-06-12 19:56:57 +00:00
Brian Paul
c8f8fbecd7 remove const qualifier from glGenVertexArraysAPPLE() parameter 2006-06-12 19:47:44 +00:00
Brian Paul
0e0e3b05ab include arrayobj.h 2006-06-12 19:46:14 +00:00
Brian Paul
050d39b3f4 remove unused var 2006-06-12 19:45:43 +00:00
Ian Romanick
ee34e6ef71 Add support for GL_APPLE_vertex_array_object. Several test programs
and demos are also added.

Adding basic support to drivers should be as easy as just enabling the
extension, though thorough test would also be required.
2006-06-12 16:26:29 +00:00
Alan Hourihane
6254d59043 fire vertices before context destruction. 2006-06-12 08:52:29 +00:00
Tilman Sauerbeck
51eb359ea9 destroy the memory manager along with the context 2006-06-11 09:12:27 +00:00
Roland Scheidegger
5b90cf2f2f enable arb_vertex_program by default if drm is new enough. Do a fallback when it's a nv_vp as there could be issues. 2006-06-10 00:51:54 +00:00
Claudio Ciccani
da4b01211b Added some notes about this implementation. 2006-06-09 15:20:26 +00:00
Claudio Ciccani
4812a59754 Enable setting invible cursors. 2006-06-09 15:19:05 +00:00
Claudio Ciccani
6acc6dd0c4 Separated joystick pointer coordinates from mouse pointer coordinates. 2006-06-09 15:18:04 +00:00
Roland Scheidegger
52c5d9c5b7 shuffle some code to make some assertions in the _savage_texstore_a111xxxx functions compile without error... 2006-06-09 00:28:53 +00:00
Brian Paul
5dbd0a400a added info about prerequisites for building DRI drivers 2006-06-08 23:42:07 +00:00
Brian Paul
11ea8cb0a2 fix glBegin error test 2006-06-08 23:12:58 +00:00
Brian Paul
ee7e58e111 check for invalid mode in glBegin(), bug 7142 2006-06-08 23:11:35 +00:00
Tilman Sauerbeck
a0daa1220f include tnl/tnl.h for _tnl_program_string() 2006-06-08 21:17:08 +00:00
Tilman Sauerbeck
3ebf0418a9 mark ARL operand as scalar (Roland Scheidegger) 2006-06-08 21:12:21 +00:00
Tilman Sauerbeck
0bc09bdace struct op_names: get rid of the 'output operands' field as it's not used (Roland Scheidegger) 2006-06-08 21:09:17 +00:00
Brian Paul
0c65604eeb links to ClosedGL and S3TC library 2006-06-08 19:59:41 +00:00
Roland Scheidegger
d6213e6023 Improve slightly wrong CMP_SRCS test to avoid unencessary instructions. Clean up the r200 vertex program code a bit. 2006-06-08 17:46:21 +00:00
Brian Paul
808809b061 updated Pixmap vs. XImage info 2006-06-07 14:01:31 +00:00
Aapo Tahkola
37474eca68 prevent possible program mix up with sw vps (Roland Scheidegger) 2006-06-06 23:44:05 +00:00
Aapo Tahkola
9248882ca2 prevent run_arb_vertex_program from running tnl programs unless ctx->_MaintainTnlProgram is set 2006-06-06 22:24:12 +00:00
Aapo Tahkola
9ba2006594 make sure tex format is supported. 2006-06-06 18:37:45 +00:00
Aapo Tahkola
2f42558050 various fixes (Roland Scheidegger) 2006-06-06 18:25:47 +00:00
Ben Skeggs
6d1f98da2b A couple of quick fixes, the original had some half-finished
modifications..
2006-06-03 17:15:50 +00:00
Ben Skeggs
ac9d1ecec2 Another TODO, so I don't forget.. 2006-06-03 16:37:46 +00:00
Ben Skeggs
5411b96c5f Add start of vertex shader backend, will most likely not work correctly yet 2006-06-03 16:36:23 +00:00
Brian Paul
4cb9fffa7e Added simple lookup_bufferobj() function to wrap the _mesa_HashLookup() call
and cast.  Simplifies the code a little bit elsewhere.
2006-06-03 15:32:27 +00:00
Brian Paul
3696f0ee1d updates for using libdrm (Hanno Bock) 2006-06-03 15:17:07 +00:00
Brian Paul
6f172f7aba minor clean-ups 2006-06-02 22:51:45 +00:00
Roland Scheidegger
98c791b543 implement arb_vertex_program in hw for r200. Code contains still some hacks, generic attribs cause a fallback, but otherwise it seems to work quite well. Passes all glean vertProg1 tests with the exception of the degnerated LIT case (which is a hw limitation), as well as runs the r200 render path of doom3/quake4 (1.1 patch needed for quake4). The code is heavily borrowed from the r300 driver as vertex programs encoding is almost identical. arb_vertex_program is not yet announced by default and still needs to be enabled via driconf. 2006-06-02 22:47:31 +00:00
Brian Paul
65ced47453 Thomas Sondergaard's API tracer 2006-06-02 14:50:28 +00:00
Brian Paul
21fbdb14e9 set per-context GL_DRAW_BUFFER state regardless of currently bound FBO 2006-06-02 12:51:56 +00:00
Brian Paul
79d8db77b9 fix depth-format rectangular textures 2006-06-02 12:47:42 +00:00
Brian Paul
2b04dd9d2c fix depth-component test to allow rectangular textures 2006-06-02 12:46:53 +00:00
Roland Scheidegger
b302419abe remove code dealing with drmMinor version < 6 since all radeon drivers request at least drmMinor 6 anyway. 2006-06-02 01:52:54 +00:00
Roland Scheidegger
5377ac80dc retry on EBUSY instead of EAGAIN in radeonWaitIrq (it appears this was the intention as drm seems to never return EAGAIN) in all radeon drivers. 2006-06-01 23:21:43 +00:00
Roland Scheidegger
fe57ed4f25 Fix extended swizzling in vertex programs by introducing special swizzle instruction, extend the 2 bit rsw field to 3 bit like used in other places. While here, also fix up rsw (negation), dph and try to fix up rsq with negative values (doesn't work, bug seems elsewhere) in the sse codegen code. 2006-06-01 22:56:40 +00:00
Brian Paul
4d3ab19abf document MESA_TEX/TNL_PROG env vars 2006-06-01 20:22:30 +00:00
Brian Paul
1ec9b5a5a9 fix extension_supported() function, added comments 2006-05-31 20:36:52 +00:00
Tilman Sauerbeck
e689a7fc6a SWZ is nearly identical to MOV. the difference is that SWZ supports per-component negation, which MOV doesn't. as that's handled transparently, we can use the same code for them. 2006-05-31 17:57:14 +00:00
Tilman Sauerbeck
49db174df5 pass src->NegateBase as-is in t_src() now, as the flags are equivalent to r300's VSF_FLAGs now 2006-05-31 17:37:23 +00:00
Claudio Ciccani
9efe17ed91 Updated config file. 2006-05-31 17:06:05 +00:00
Claudio Ciccani
fe94d0b335 Added some example progs using DirectFBGL. 2006-05-31 17:05:11 +00:00
Claudio Ciccani
b18191cf30 Added DirectFB GLUT implementation. 2006-05-31 17:02:45 +00:00
Claudio Ciccani
9400550c16 Fixed bug with multiple contexts.
Added support for ARGB4444 and ARGB2554.
Added hardware accelerated Clear().
2006-05-31 17:00:10 +00:00
Brian Paul
55ad3cc055 fix bug 7077 - mem leak 2006-05-30 22:26:21 +00:00
Brian Paul
a8c4242395 Define new NEGATE_* tokens for setting the src register's NegateBase field.
Before, we were using GL_TRUE/GL_FALSE in a few places.
Note: only the SWZ instruction can negate individual components.
2006-05-30 22:17:35 +00:00
Brian Paul
e4cb9cd167 remove redundant 'const' 2006-05-30 22:15:24 +00:00
Brian Paul
8333012b56 free convolved image / fix mem leak (bug 7077) 2006-05-30 21:58:55 +00:00
Tilman Sauerbeck
1d0fa45bc1 minor code cleanup, no actual changes 2006-05-30 18:49:20 +00:00
Tilman Sauerbeck
6be8127ea4 don't generate GL_INVALID_ENUM if GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB, which is actually handled 2006-05-30 16:57:52 +00:00
Michal Krol
51fec69ea6 Add x86sse.h. 2006-05-30 09:59:05 +00:00
Michal Krol
4decba90be Remove not needed forward declaration. 2006-05-30 09:45:33 +00:00
Michal Krol
23b7c7dc14 Make it running under Linux. 2006-05-30 09:38:16 +00:00
Michal Krol
44d5c8668a First draft. 2006-05-30 09:35:36 +00:00
Tilman Sauerbeck
b20cdf1d28 don't do the check for >= MAX_VERTEX_PROGRAM_ATTRIBS twice, it's already done in parse_generic_attrib_num() 2006-05-29 16:24:28 +00:00
Brian Paul
919f6a070c generic attribute 0 wasn't handled correctly (Jesse Allen) 2006-05-29 14:37:56 +00:00
Roland Scheidegger
76b6e88e56 fix some whitespace in previous commit 2006-05-27 09:09:56 +00:00
Roland Scheidegger
8a61821057 preparation for r200 hw vertex programs. Increase R200_CMD_BUF_SZ to 16k instead of 8k (the reasons why it was exactly 8k are unclear). Add register defines, sanity code, fix potential issue with wrong statechange order when disabling fragment programs. 2006-05-27 09:03:25 +00:00
Brian Paul
04fa003a50 The ctx->_TexEnvProgram that's allocated in update_state() doesn't seem to
be needed (it's set in texenvprogram.c) and is a memory leak according to
valgrind.
Disable with #if 0 / #endif
2006-05-24 03:34:17 +00:00
Brian Paul
65a51c0d62 Roll _mesa_free_parameters() into calling function (the only caller).
Replace assert(0) with _mesa_warning().
Use new _mesa_align_realloc() function.
New comments, clean-ups.
2006-05-24 03:30:31 +00:00
Brian Paul
5a67af97fa fix a small memory leak in _mesa_add_state_reference() 2006-05-24 03:25:22 +00:00
Brian Paul
1798d9a8a4 added _mesa_align_realloc() 2006-05-24 03:15:46 +00:00
Brian Paul
0c1cbd5805 use GLbitfield for StateFlags, improved comments 2006-05-24 03:01:58 +00:00
Brian Paul
d9736db667 Add const qualifiers in a number of places. 2006-05-23 02:44:46 +00:00
Brian Paul
f5a2ac95c3 init mask=0 to silence warning 2006-05-23 02:16:20 +00:00
Brian Paul
fe9026d04a make mgaSetFence() and mgaWaitFence() static 2006-05-23 02:13:53 +00:00
Brian Paul
a6f7f10efa prototype i915_udpate_fog() to silence warning 2006-05-23 02:12:08 +00:00
Brian Paul
b8f2f6fee1 In cache_item(), there was sizeof(void) expression.
Replace void *key parameter with const struct state_key *
2006-05-23 01:55:31 +00:00
Brian Paul
acc9566b86 GL_INDEX_OFFSET fix 2006-05-22 17:41:59 +00:00
Brian Paul
17befff800 GL_INDEX_OFFSET didn't work with CI->RGB mappings.
Added some const qualifiers.
2006-05-22 17:40:07 +00:00
Keith Whitwell
8065c120c4 memory usage fixes for glean/conform, use a better hash function 2006-05-22 16:09:27 +00:00
Keith Whitwell
64da16146f Fix typo 2006-05-22 14:30:58 +00:00
Keith Whitwell
5ddc53f899 Better caching for texenv programs.
Initialize some values correctly.
2006-05-22 14:17:32 +00:00
Keith Whitwell
7e3fa7e837 Speedup the venerable mm.[ch] allocator with doubly linked lists and a
separate list of free segments.
2006-05-22 12:32:35 +00:00
Brian Paul
b0b6d1abe5 In gl_texture_image, replace ImageStride with an ImageOffsets array.
Some hardware lays out 3D mipmaps in a manner that can't be expressed
with a simple image stride.
The ImageOffsets array is allocated and initialized to typical defaults
in the _mesa_init_teximage_fields() function.  If needed, a driver will
then have to replace these offsets.
TexStore and TexelFetch routines updated to use offsets array.
2006-05-20 16:19:48 +00:00
Brian Paul
226d0187b5 glxinfo -l expanded, fixed bug 6863 2006-05-20 15:18:23 +00:00
Brian Paul
04d5d16415 remove some redundant functions, fix-up reference counting 2006-05-20 15:16:45 +00:00
Brian Paul
89ffca52ac use new _mesa_remove_renderbuffer() 2006-05-20 15:12:42 +00:00
Brian Paul
7ac5b7b934 use new _mesa_dereference_frame/renderbuffer() functions 2006-05-20 15:08:25 +00:00
Brian Paul
b52f02121b Added _mesa_remove_renderbuffer() as a counterpart to _mesa_add_renderbuffer().
Added _mesa_dereference_renderbuffer() to encapsulate renderbuffer
reference count decrement, delete, locking.
2006-05-20 15:07:32 +00:00
Brian Paul
2eb88c1752 Added _mesa_dereference_framebuffer() to encapsulate reference count
decrement, delete and locking.
2006-05-20 15:06:35 +00:00
Brian Paul
cbb19930b3 some new comments 2006-05-19 17:31:09 +00:00
Brian Paul
20e11b2332 remove an assertion 2006-05-19 17:27:33 +00:00
Brian Paul
4e470db0b9 print 2D vs 3D in window 2006-05-19 16:48:42 +00:00
Brian Paul
5ec34f0ff9 also test 3D textures (press '2'/'3' to toggle) 2006-05-19 16:42:01 +00:00
Brian Paul
083f8111aa added some CHAN_BITS tests 2006-05-19 03:49:13 +00:00
Brian Paul
68bc7df638 replace FORMAT var with RB_TYPE 2006-05-19 03:47:16 +00:00
Brian Paul
fd02ca7711 Demonstrate rendering 8, 16 and 32-bit/channel images all in one program.
Like older osdemo.c program, but test more OpenGL features like texturing,
blending, lines.
2006-05-19 03:43:39 +00:00
Brian Paul
e35b9058ce updated docs for off-screen rendering 2006-05-19 03:42:16 +00:00
Brian Paul
d44248ca00 Allow rendering 8, 16 and 32-bit/channel images without recompiling.
Uses new renderbuffer adaptors.
2006-05-19 03:41:37 +00:00
Brian Paul
6a74f65c58 install renderbuffer adaptors when color channel sizes need to be reduced 2006-05-19 03:40:29 +00:00
Brian Paul
d2e5598cd3 added rbadaptors.[ch] files 2006-05-19 03:37:41 +00:00
Brian Paul
e2db790a46 added rbadaptors.c 2006-05-19 03:35:38 +00:00
Brian Paul
3c30b35134 Renderbuffer adaptors.
When compiling Mesa with CHAN_BITS=16 or 32, these adaptors allow rendering
into color buffers with smaller channel sizes.
2006-05-19 03:33:50 +00:00
Brian Paul
23a5c57cee minor simplification 2006-05-18 22:31:19 +00:00
Brian Paul
0ca9082cbd texture EnvColor needs to be converted to GLchan, not GLint 2006-05-18 22:11:09 +00:00
Aapo Tahkola
787fd58186 Dont allow 16 tex units to be used at all. 2006-05-18 21:15:26 +00:00
Brian Paul
5e51ebd8eb use -march=i486 instead of -m486 (bug 6954) 2006-05-18 17:04:13 +00:00
Brian Paul
0d957ca400 change initialization of texcoords - not all C compilers support non-constant array initializers 2006-05-18 14:16:43 +00:00
Brian Paul
3d8a791ff9 add extra APP_LIB_DEPS (bug 6954) 2006-05-18 13:55:31 +00:00
Brian Paul
c717ffa146 added solaris-x86-gcc-static 2006-05-17 22:51:44 +00:00
Brian Paul
7d848c3308 generate shared lib, not static 2006-05-17 22:51:23 +00:00
Brian Paul
9cc115e417 formerly known as solaris-x86-gcc 2006-05-17 22:51:08 +00:00
Brian Paul
4c6319db9c call reshape() after init() to set initial projection/viewing transform (see bug 6941) 2006-05-17 22:44:18 +00:00
Tilman Sauerbeck
b99c801f73 unbreak the build 2006-05-17 16:39:40 +00:00
Dave Airlie
cea0c74bcb add texture rectangle support for i815, I wrote the original patch about
2 years ago, I finally dug out an i815 and got it working
2006-05-17 06:26:25 +00:00
Tilman Sauerbeck
601c02f783 bug 6941: fixed initial rendering problems in glxgears 2006-05-16 16:27:54 +00:00
Michal Krol
bd4256acfd Fix typo. 2006-05-16 10:37:16 +00:00
Michal Krol
0b9d7e477a Add functions. 2006-05-16 10:11:29 +00:00
Michal Krol
969c43108e Write attribs to slang machine. 2006-05-16 10:10:56 +00:00
Michal Krol
b4c5905549 Change error message wording. 2006-05-16 10:10:10 +00:00
Michal Krol
b6e92d090c Rename print() to printMESA(). 2006-05-16 10:09:32 +00:00
Michal Krol
563f8ad50a Fix attrib handling. 2006-05-16 10:08:30 +00:00
Michal Krol
21ef956e9a Extend printMESA function to output also to shader's info log.
Fix float-to-int conversion for x86 back-end.
2006-05-16 10:04:24 +00:00
Michal Krol
a67330d157 Cleanup code. Change constructor prototype. 2006-05-16 10:01:07 +00:00
Michal Krol
d1b40400d6 Cleanup code. 2006-05-16 09:53:42 +00:00
Michal Krol
ecf2e5b0a1 Change constructor prototype.
Fix struct field accessing.
2006-05-16 09:52:02 +00:00
Michal Krol
d2b9e1c560 Remove carriage returns. 2006-05-16 09:44:08 +00:00
Michal Krol
d88c67fd81 Add GetInfoLogLength and WriteAttrib functions.
GetInfoLog for shaders if different - it is a concatenation
of compiler output and executor output produced by printMESA.
Fix bugs.
2006-05-16 09:43:09 +00:00
Michal Krol
a1a02e6203 Cleanup GLhandle-to-object translation macros.
Fix minor bugs.
2006-05-16 09:40:30 +00:00
Michal Krol
32c2f939e6 GLSL regression test suite. 2006-05-16 09:32:30 +00:00
Brian Paul
2ca741ad4b added a few extension #ifdef tests 2006-05-15 15:35:38 +00:00
Brian Paul
5e2e96b6f0 Added a check_context_limits() function that checks that the ctx->Const.*
fields are legal.  May catch some driver development bugs.
Called the first time a context is bound.
2006-05-15 15:26:04 +00:00
Brian Paul
c8ea111166 usage() function 2006-05-15 15:14:37 +00:00
Brian Paul
20215ecc7d remove some unused macros 2006-05-14 16:42:20 +00:00
Brian Paul
d77a165eac s/GLbyte/GLubyte/ 2006-05-14 16:27:10 +00:00
Brian Paul
ed875a4cb3 fix typo, remove dead code 2006-05-14 15:56:07 +00:00
Brian Paul
ad7805dfee Expanded output with -l option: vertex/fragment program and vertex/fragment
shader limits.
Misc sync-ups with x.org copy of glxinfo.
2006-05-13 00:18:12 +00:00
Dave Airlie
f1dbacc6ad the r300 should only use 8 until Mesa can deal with this 2006-05-12 06:03:27 +00:00
Dave Airlie
5d7ab75b02 this should use the configured number not the MAX, this has no effect until
the core mesa swrast number is fixed, just spotted this on the way past
2006-05-12 03:50:10 +00:00
Brian Paul
88cf5aa783 In __glXPushArrayState() we weren't pushing the index field.
But later, in __glXPopArrayState(), we were using that field to set
the active_texture_unit.  The value was garbage and could lead to
things blowing up.
See bug 6863.
2006-05-11 16:27:39 +00:00
Brian Paul
fa489dd043 simplify image setup code, added LOD Bias control (l/L keys) 2006-05-11 01:15:48 +00:00
Brian Paul
aecd02b391 simple texture compression test 2006-05-10 22:47:06 +00:00
Brian Paul
932c2fc291 new test image - Delicate Arch, Utah 2006-05-10 22:44:26 +00:00
Brian Paul
bb2dd388d0 Test program for exercising GL_TEXTURE_BASE_LEVEL and GL_TEXTURE_MAX_LEVEL. 2006-05-10 22:37:56 +00:00
Brian Paul
1e7d84e258 move check for event.xbutton.button <= GLUT_MAX_MENUS (see sf bug 1484284) 2006-05-10 19:21:39 +00:00
Brian Paul
700359ca5a check if button >= GLUT_MAX_MENUS in glutAttacheMenu() 2006-05-10 19:21:16 +00:00
Keith Whitwell
adc0490420 Clean up previous change slightly 2006-05-10 09:00:16 +00:00
Keith Whitwell
452be7e7ef Use a (much!) larger executable memory heap so that the glsl x86
allocations succeed.  I'm not sure this is really necessary...
2006-05-10 08:57:34 +00:00
Brian Paul
2b3aab0717 check event button against GLUT_MAX_MENUS (bug 1484284) 2006-05-09 14:51:57 +00:00
Brian Paul
ab13ec10eb 16/32-bit chan fixes, texture compression fixes 2006-05-09 14:41:08 +00:00
Brian Paul
791e7b385a When error-checking 'unit' against num_texture_units, need to use >=, not >.
See bug 6863.
2006-05-09 14:36:58 +00:00
Brian Paul
008ed1df83 Add a new 'all' parameter to _mesa_get_compressed_formats() to indicate whether
all formats or just those without restrictions/limitations should be returned.
We want all when validating the internalFormat parameter to
glCompressedTexImage2D but only want unrestricted formats when handling the
GL_COMPRESSED_TEXTURE_FORMATS query.
2006-05-09 13:51:17 +00:00
Brian Paul
5e4c39dc0e use _mesa_compressed_texture_size() for GL_TEXTURE_COMPRESSED_IMAGE_SIZE query 2006-05-09 00:00:46 +00:00
Brian Paul
a546769733 two more texture compression fixes 2006-05-08 23:59:38 +00:00
Brian Paul
c3c19be8e0 More updates for texture compression.
Added _mesa_compressed_texture_size_glenum() for validating the imageSize
parameter to glCompressedTex[Sub]Image1/2/3() which does _not_ call
ctx->Driver.CompressedTextureSize() - since that could return a padded size.
2006-05-08 23:52:32 +00:00
Brian Paul
5999c5b620 Fix a number of texture compression issues.
Pass the MESA_FORMAT_* token to the _mesa_compressed_row_stride(),
_mesa_compressed_texture_size() and _mesa_compressed_image_address()
functions since we want to use the driver-chosen format, not the user's
internalFormat hint.
Consolidate code related to choosing the texture format in texstoree.c
2006-05-08 19:14:38 +00:00
Brian Paul
c93c18abf1 fix warning 2006-05-08 19:11:21 +00:00
Keith Whitwell
71b2504e03 updates to dri drivers for recent stencil changes 2006-05-08 09:03:35 +00:00
Brian Paul
960973b2ec added CHAN_BITS != 8 test 2006-05-07 16:16:23 +00:00
Brian Paul
85bc17495b misc clean-ups 2006-05-07 16:14:58 +00:00
Brian Paul
ca8b235188 minor clean-ups around DepthScale/Bias 2006-05-07 16:14:13 +00:00
Brian Paul
8a1848bf99 restore -O flag (bug 6814) 2006-05-06 22:39:33 +00:00
Brian Paul
0c7cbf0a7c Check for overflow when converting floating pt Z values to 32-bit GLuint. 2006-05-06 22:30:33 +00:00
Brian Paul
efbf170cfb updated GLX_EXT_texture_from_pixmap tokens (Dave Reveman) 2006-05-05 18:19:54 +00:00
Brian Paul
9b20b68af1 check for float->uint overflow in _mesa_unpack_depth_span() 2006-05-05 14:49:38 +00:00
Keith Whitwell
6717a7aca0 Define VERT_RESULT_EDGE 2006-05-05 09:26:40 +00:00
Dave Airlie
86740f1593 remove temporary code from keithw, this in theory isn't used at the moment
anyways unless INTEL_BATCH is turned on
2006-05-05 06:53:11 +00:00
Dave Airlie
2364d9abd3 Fix i915 driver after stencil changes in Mesa 6.5 2006-05-05 06:52:32 +00:00
Keith Whitwell
ab377ce414 Release temporary 2006-05-05 00:00:46 +00:00
Ian Romanick
6e2ab82f5c Fix some silly spelling errors. 2006-05-03 17:12:12 +00:00
Dave Airlie
ee251d4313 remove some unneeded includes 2006-05-02 08:58:42 +00:00
David Reveman
bea7fe57c1 Update to final EXT_tfp tokens 2006-05-02 08:54:39 +00:00
Dave Airlie
698b04c735 move the pkg config flags for libdrm to the bottom 2006-05-02 08:32:46 +00:00
Adam Jackson
0157624557 Update function signatures for EXT_tfp entrypoints. 2006-05-01 22:25:18 +00:00
Brian Paul
ae7f22f1ef new, faster version of __gluInvertMatrixd(), bug 6748 2006-05-01 16:01:17 +00:00
Jeremy Kolb
0174d894ef Bumped support for xcb 0.9 2006-04-29 16:13:02 +00:00
Tilman Sauerbeck
c5b3343e65 added a trailing newline to pacify gcc 2006-04-28 21:57:32 +00:00
Tilman Sauerbeck
9ecd280f33 fptest1 requires GL_NV_fragment_program 2006-04-28 21:50:41 +00:00
Brian Paul
6a769d97e3 fix second memory leak (bug 5557) 2006-04-28 15:42:15 +00:00
Brian Paul
49a80ca2bc fix first memory leak (bug 5557) 2006-04-28 15:40:11 +00:00
Brian Paul
c4fe46f0b8 fixes for CHAN_BITS!=8 2006-04-27 02:50:31 +00:00
Brian Paul
444cd293fd assorted clean-ups, fixes 2006-04-27 02:47:50 +00:00
Brian Paul
e814d5e89f replace a bunch of casts with GET_XRB macro 2006-04-27 02:46:20 +00:00
Brian Paul
edc16a5f7a fix a few stride computations in _mesa_texstore_rgba() 2006-04-26 18:43:22 +00:00
Aapo Tahkola
e440bcf41a fix warnings. 2006-04-26 12:00:53 +00:00
Aapo Tahkola
d44c3e647f R300_SPAN_DISABLE_LOCKING env var 2006-04-26 11:36:27 +00:00
Brian Paul
a4ebd5f684 remove _glthread_INIT_MUTEX() call 2006-04-26 03:31:59 +00:00
Brian Paul
65dccf377d fix an assertion 2006-04-26 03:29:30 +00:00
Brian Paul
faee3f0f1e minor clean-up 2006-04-26 03:19:54 +00:00
Brian Paul
901ac21938 remove old XFree86 tag 2006-04-26 03:19:37 +00:00
Brian Paul
9c4fd26bca update some tests for visual bit depths to use renderbuffers 2006-04-25 22:55:19 +00:00
Brian Paul
2486267dda use _TNL_FIRST/LAST_MAT indexes 2006-04-25 22:26:21 +00:00
Michal Krol
6acf1e93a2 Remove carriage returns. 2006-04-25 10:11:59 +00:00
Brian Paul
cb0ae25a4e vertex attrib alias change, glPopAttrib/GL_DRAW_BUFFER bug fix 2006-04-25 00:55:47 +00:00
Brian Paul
94b30dc390 Put color index attribute into the 6th attribute slot.
Update a lot of loops, conditionals to use the _TNL_FIRST/LAST_* values
instead of specific vertex attributes.
Remove the EdgeFlagv function from the GLvertexformat struct.
2006-04-25 00:53:25 +00:00
Brian Paul
5bdc6fdebc silence warnings 2006-04-25 00:31:22 +00:00
Brian Paul
095c6699f4 No longer alias generic vertex attribs with conventional attribs for GL_ARB_vertex_program. 2006-04-25 00:21:32 +00:00
Brian Paul
f12ea2d402 extended swizzle (bug 6727) 2006-04-24 16:33:25 +00:00
Brian Paul
9cd1cc0535 fprintf() clean-up (bug 6730) 2006-04-24 16:32:05 +00:00
Brian Paul
263fff44b4 updated assertion 2006-04-23 15:28:54 +00:00
Aapo Tahkola
44a22a2c28 enable feedback rendering 2006-04-23 08:04:50 +00:00
Aapo Tahkola
a55842b9b3 disable hw locking when entering span rendering for now 2006-04-23 07:59:40 +00:00
Aapo Tahkola
95cc7a6dac need to hold before freeing 2006-04-23 07:15:19 +00:00
Benjamin Herrenschmidt
aa93b4ced0 Enable USER_BUFFERS, RADEON_VTXFMT_A and HW_VBOS on big endian by forcing all elts
to 32 bits (it would be possible to do a half word swap for 16 bits if somebody is interested) and by using the input route mecanism to swap ubyte's properly in r300EmitArrays. Tested with cva, varray and quake3
2006-04-23 05:54:06 +00:00
Brian Paul
2f92adb9e0 Fix yet another issue with popping GL_DRAW_BUFFER state with respect to
single vs. multiple outputs and what kind of FBO is currently bound.
2006-04-22 01:20:20 +00:00
Adam Jackson
e60ce392d8 Ensure all GART allocations are freed on context destruction, rather than
waiting for the DRM to reap them at process exit.  Fixes (fatal) allocation
failures in AIGLX configurations.

Reviewed by: Aapo Tahkola
2006-04-21 19:53:52 +00:00
Adam Jackson
ca98203cd9 Fix format strings for LP64 2006-04-21 19:51:29 +00:00
Brian Paul
b87957d59a pass color index as float, not int 2006-04-21 02:44:35 +00:00
Brian Paul
ba999b1a3f depend is not a .PHONY target 2006-04-21 01:13:16 +00:00
Brian Paul
a95dd106e3 fix indentation 2006-04-21 01:02:49 +00:00
Brian Paul
fb87976ef6 use vertex.attrib[3] instead of vertex.color 2006-04-21 01:02:27 +00:00
Brian Paul
8743d00571 s/NV/ARB/ 2006-04-21 01:01:58 +00:00
Aapo Tahkola
34ba50522a limit max program/param length to 255 (spotted by sroland) 2006-04-20 19:43:21 +00:00
Brian Paul
8a97946e0a check glLoadProgramNV len < 0 (bug 6679) 2006-04-20 15:06:40 +00:00
Brian Paul
45e05dccd9 error_attrib() should generate GL_INVALID_VALUE, not GL_INVALID_ENUM.
New doxygen comments, misc clean-ups.
2006-04-20 02:29:26 +00:00
Brian Paul
3538f81513 Make most of the _mesa_noop_*() functions static.
Generate GL_INVALID_VALUE, not GL_INVALID_ENUM when glVertexAttrib is called
with a bad index.
Use _mesa_noop_vtxfmt_init() in DRI drivers to initialize vertex format
struct.
2006-04-20 02:16:55 +00:00
Brian Paul
34b3b40af9 some tentative code for _mesa_update_framebuffer_visual() 2006-04-20 00:45:08 +00:00
Dave Airlie
b5d76b6858 SrcReg->Swizzle is always initialized to SWIZZLE_NOOP, and if the program
specifies a 2/3/4-compontent swizzle suffix, SrcReg->Swizzles is just ORed
against the new component values, without resetting it first.

Attached patch makes tests/vptest2 pass.

From Tilam Sauerbeck bug 6673
2006-04-19 23:15:51 +00:00
Brian Paul
6e542f11c9 minor updates 2006-04-19 16:55:27 +00:00
Brian Paul
53f8b7190e fix invalid free() problem (bug 6658) 2006-04-19 14:42:01 +00:00
Brian Paul
5beff7c6c1 updates for GNU/Hurd (bug 6657) 2006-04-19 14:03:04 +00:00
Brian Paul
12ad488e59 Replace old README.X11 with updated xlibdriver.html 2006-04-19 03:25:06 +00:00
Brian Paul
b3282a3b9d assorted AIX, IRIX fixes from Dan Schikore 2006-04-18 12:56:11 +00:00
Brian Paul
e34bf25d2d -arch AIX64 no longer needed 2006-04-18 12:55:48 +00:00
Michal Krol
2f8496b565 Remove carriage-return chars *ONLY*. 2006-04-18 10:47:19 +00:00
Michal Krol
d55de658b5 Add support for ARB_vertex_shader attrib binding and query.
Clean-up ARB_shaderobjects code a bit.
2006-04-18 10:30:29 +00:00
Kristian Høgsberg
fcdc6a7d24 Add .note.GNU-stack section to assembler files to avoid the default behavior
of requesting executable stacks.
2006-04-17 18:58:24 +00:00
Jeremy Kolb
13a2d6698f More context. 2006-04-17 15:20:29 +00:00
Jeremy Kolb
ddf936193a Changed invalid context fields to valid ones. 2006-04-17 00:08:03 +00:00
Jeremy Kolb
a7d8885768 State changes. 2006-04-15 00:21:44 +00:00
Stephane Marchesin
b0c4cfed60 More work on the tcl code... still have to make my mind on a number of
things
2006-04-14 23:47:45 +00:00
Jeremy Kolb
97d11ecd6c Add more feilds to context. 2006-04-14 23:02:39 +00:00
Stephane Marchesin
911ec211a5 ooops 2006-04-14 22:59:33 +00:00
Stephane Marchesin
4c850f346b Added render index field to the context 2006-04-14 22:58:30 +00:00
Jeremy Kolb
576b3433da Cleaning 2006-04-14 22:50:14 +00:00
Stephane Marchesin
4b2d8b46c8 Silence the lock warning 2006-04-14 22:48:03 +00:00
Stephane Marchesin
b7d4314fe1 Added vertex attributes to the context 2006-04-14 22:43:44 +00:00
Stephane Marchesin
199512968b Cleaned stuff in the tcl code 2006-04-14 22:41:16 +00:00
Jeremy Kolb
5fd11335f6 Added the beginnings of state (not much there yet). Fixed some includes. 2006-04-14 17:39:43 +00:00
Brian Paul
28bc3cdfba another simple FBO test 2006-04-14 16:25:27 +00:00
Brian Paul
3adee0829b test glReadPixels speed w/ various formats/types, PBOs 2006-04-14 16:20:55 +00:00
Brian Paul
1e1af99132 Use 'file' command in more places to determine the library ABI (IRIX, SunOS,
Darwin), removes need to pass in special -archopt flags.
Restore the -dlopen flag afterall.
2006-04-14 14:14:51 +00:00
Brian Paul
6bef5e7621 Don't have to pass ABI-related flags to mklib anymore. 2006-04-14 14:13:00 +00:00
Brian Paul
9326962f06 Silence a few -pedantic warnings.
Remove ^M chars.
Replace _mesa_get_string() with simpler copy_string().
2006-04-14 03:43:39 +00:00
Brian Paul
a76c216b37 s/MaxTextureUnits/MaxTextureCoordUnits/ 2006-04-14 02:28:26 +00:00
Brian Paul
780155ab31 6.5.1 fixes 2006-04-14 02:26:40 +00:00
Brian Paul
730b26556b When popping GL_DRAW_BUFFER state, need to re-do error checking since
validity depends on whether a window-system FBO or user-created FBO is
currently bound.  glPopAttrib() may generate GL_INVALID_OPERATION because
of this.
2006-04-14 02:25:35 +00:00
Brian Paul
61608ecfa7 silence -pedantic warning 2006-04-14 02:21:04 +00:00
Brian Paul
767ffdcc9f don't need s_depth.h 2006-04-14 02:20:47 +00:00
Brian Paul
ee4e75bd6f Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]Units
in various places.
Note that ctx->Texture.CurrentUnit needs to be tested against Coord/Image
limits when referenced, not just in glActiveTexture().
2006-04-14 02:20:18 +00:00
Brian Paul
1d886a81ad If the image file is RGB, convert to RGBA (fixes segfault).
Added CheckError() calls.
Remove -ci option.
2006-04-13 19:45:42 +00:00
Brian Paul
da238ee06a Fix comment about MaxTextureUnits, needs to be min of coord and image units.
See bug 5994.
Also add a few assertions.
Use MaxTextureUnits in get.c code.
There's probably other places where we need to clean-up the usage of the
MaxTexture[Coord/Image]Units constants.
2006-04-13 19:21:58 +00:00
Brian Paul
564b2aa2ef silence minor warnings 2006-04-13 19:18:40 +00:00
Brian Paul
13abf91b42 casts to fix some -pedantic warnings 2006-04-13 19:17:13 +00:00
Jeremy Kolb
f799745f50 Some compile fixes. 2006-04-13 17:03:51 +00:00
Brian Paul
ad38681a00 Set array normalization flag for normals, colors (Keith) 2006-04-13 15:57:29 +00:00
Brian Paul
56e0ee8efe remove the -dlopen option. Always make both kinds of libs for AIX, Darwin. 2006-04-13 15:17:50 +00:00
Brian Paul
cbed2f8061 more updates (Dan Schikore) 2006-04-13 03:10:16 +00:00
Brian Paul
294d9abf6f add new configs (Dan Schikore) 2006-04-13 03:00:14 +00:00
Brian Paul
cb32dcfa33 new configs, misc updates (Dan Schikore) 2006-04-13 02:59:29 +00:00
Brian Paul
fe14cf6951 Fixes for AIX, SunOS, Darwin. -dlopen flag to build dlopen()'able modules
for AIX, Darwin.  (Dan Schikore)
2006-04-13 02:23:25 +00:00
Brian Paul
ecc0d10d2d Use -I$(INCDIR) to get Mesa, not system headers (Dan Schikore) 2006-04-13 01:54:04 +00:00
Brian Paul
a186c80788 updated tests for defining __FUNCTION__ (Dan Schikore) 2006-04-13 01:52:32 +00:00
Brian Paul
09c8e41955 added 'const' (Dan Schikore) 2006-04-13 01:51:25 +00:00
Brian Paul
c4a4864210 compile fix from Dan Schikore 2006-04-13 01:49:45 +00:00
Aapo Tahkola
c82eadd157 GLboolean cannot hold GLuint! usage of tmus >= 4 no longer lock r300. 2006-04-12 13:51:18 +00:00
Brian Paul
68ad7ca3ba allow rotation w/ mouse 2006-04-11 23:41:40 +00:00
Brian Paul
da21ca988a add missing 'union' keyword 2006-04-11 23:23:36 +00:00
David Reveman
ba23f699f0 FBConfig support for EXT_tfp 2006-04-11 12:21:48 +00:00
David Reveman
ea2b711061 Add attrib_list to glXBindTexImageEXT 2006-04-11 12:19:06 +00:00
David Reveman
c6f8ae1085 Add attrib_list to glXBindTexImageEXT 2006-04-11 12:12:13 +00:00
David Reveman
342d1de38c Fix CreateDrawable 2006-04-11 12:07:41 +00:00
Michal Krol
bb38cadb1c More GLSL code:
- use macros to access and modify render inputs bit-field;
- un-alias generic vertex attributes for ARB vertex calls;
- use MAX_VERTEX_PROGRAM_ATTRIBS (NV code) or MAX_VERTEX_ATTRIBS
  (ARB code) in place of VERT_ATTRIB_MAX;
- define VERT_ATTRIB_GENERIC0..15 for un-aliased vertex
  attributes for ARB_vertex_shader;
- fix generic attribute index range check in arbprogparse.c;
- interface GLSL varyings between vertex and fragment shader;
- use 64-bit optimised bitset (bitset.h) for render inputs;
2006-04-11 11:41:11 +00:00
Aapo Tahkola
d90ad3fd87 get fog going(for real) 2006-04-11 11:20:43 +00:00
Aapo Tahkola
3ed16bd9cc rectangular fp16 fixes (Ewald Snel) 2006-04-11 04:20:25 +00:00
Aapo Tahkola
6c419be402 Fog support (Ewald Snel) 2006-04-11 04:17:50 +00:00
Brian Paul
3a5ec72125 use _mesa_debug() instead of message() - fixes poor formatting of output 2006-04-10 23:36:18 +00:00
Eric Anholt
8c3d15ce28 Destroy the GL context after driDestroyTextureHeap, because the driver's
DestroyTexObj has a dependence on the glCtx and may segfault otherwise.
2006-04-09 17:48:28 +00:00
Aapo Tahkola
83a43aca23 fix some conflict happenings at context destroy by freeing buffers immediately. array locking can be done with vbos for vtxfmt_a so we dont really need to try to reuse them. 2006-04-08 20:05:50 +00:00
Brian Paul
ff2b910dd1 regenerate SPARC assembly dispatch (bug 6484) 2006-04-07 15:20:33 +00:00
Brian Paul
9073c40c7e added sunos5-64-gcc (bug 6484) 2006-04-07 15:16:46 +00:00
Brian Paul
1936019cd1 replace >&/dev/null with >/dev/null so it works with all shells 2006-04-07 15:11:51 +00:00
Brian Paul
9f3bcd87db bump version to 6.5.1 2006-04-07 14:29:52 +00:00
Alan Hourihane
e2af1da1d3 Fix some warnings on x86_64 2006-04-07 08:50:39 +00:00
Dave Airlie
9d3de643d1 make miniglx use libdrm properly 2006-04-07 03:20:56 +00:00
Adam Jackson
d25ad506f2 Coverity #943: Avoid a NULL chase. 2006-04-07 00:05:50 +00:00
Adam Jackson
03593f53e7 Coverity #1083: Fix a use after free case. 2006-04-06 23:50:44 +00:00
Brian Paul
0a605f93db fixed line clipping bug 6512 2006-04-06 22:15:27 +00:00
Brian Paul
51faca1270 Rename CLIP_ALL_BITS to CLIP_FRUSTUM_BITS to reflect the fact that the value
only includes the 6 frustum bits, not the user-clip plane bit, nor the vertex
cull bit.
2006-04-06 22:11:57 +00:00
Brian Paul
f51a32e82a Fix line clipping bug 6512.
This fix is to discard the line if both dot products are negative.
2006-04-06 22:07:01 +00:00
Brian Paul
05529fefa4 minor CFLAGS clean-up 2006-04-06 16:50:38 +00:00
Brian Paul
f4d5b1da7b Set DRIVER_DEFINES instead of DEFINES to fix duplicate flags problem 2006-04-06 16:48:36 +00:00
Brian Paul
0dcab2a86a Replace DEFINES with DRIVER_DEFINES. If a driver needs to set extra flags,
do so with DRIVER_DEFINES.
This eliminates the duplicated flags we were passing to each cc command.
2006-04-06 16:47:51 +00:00
Brian Paul
789eb27870 minor CFLAGS reordering 2006-04-06 16:46:34 +00:00
Brian Paul
c1c954e81b remove unused var 2006-04-06 16:24:01 +00:00
Brian Paul
a1a9858ca3 update a couple MESA_FORMAT_Zxxx occurances 2006-04-06 16:23:40 +00:00
Brian Paul
e099ce85ca re-enable animation 2006-04-06 04:34:09 +00:00
Brian Paul
dc32eb8f93 fix render to depth texture bugs 2006-04-06 04:25:48 +00:00
Brian Paul
a9bcf75103 Replace MESA_FORMAT_DEPTH_COMPONENT_FLOAT32 with 32-bit integer format.
This allows render to depth texture (we don't support floating pt. Z buffers).
Rename MESA_FORMAT_DEPTH_COMPONENT16/32 as MESA_FORMAT_Z16/32.
Software fallback for glCopyTexImage now uses integer temporary image instead
of float, eliminates a lot of float/int conversions.
2006-04-06 04:23:58 +00:00
Brian Paul
762c3618f5 Added render to depth texture support with GL_EXT_framebuffer_object.
Only render the shadow/depth texture when really needed, not every frame.
Remove support for old SGIX shadow extensions.
2006-04-06 04:11:28 +00:00
Brian Paul
5722338ea5 do additional checking for setting up depth/stencil wrappers 2006-04-06 04:09:03 +00:00
Brian Paul
32cd166971 remove duplicated framebuffer attachment test 2006-04-05 19:58:37 +00:00
Brian Paul
f08f233d6f Remove the code that checks for duplicated framebuffer attachments (which
generated the error GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT).
This was removed in version 117 of the GL_EXT_framebuffer_object spec.
2006-04-05 19:58:10 +00:00
Brian Paul
59ebe1ff77 pass -m32 or -m64 to linker for SunOS as needed (bug 6484) 2006-04-05 13:43:02 +00:00
Dave Airlie
e80b9c24f4 add tiling/fence support for the miniglx driver 2006-04-05 07:13:17 +00:00
Dave Airlie
2e7af79f48 don't waste the reserved memory, take an approximation of the pool
allocator from the X.org driver - not as complicated
2006-04-05 06:20:58 +00:00
Brian Paul
c87809c9ed just some comments/docs 2006-04-05 03:29:46 +00:00
Brian Paul
1979b6b2de set the texture border color for the depth texture 2006-04-05 03:26:12 +00:00
Brian Paul
900da88dae first 6.5.1 bug fix - bug 6498 2006-04-05 03:25:05 +00:00
Brian Paul
9ebe3b6d36 Check/use texture border color when sampling depth textures. (bug 6498)
Silence some warnings.
2006-04-05 03:23:44 +00:00
Brian Paul
28b014ee25 Silence minor compiler warnings (-Wextra). 2006-04-05 03:05:17 +00:00
Alan Hourihane
027bb77e02 We always have a back buffer. Fixes visual problems. 2006-04-04 13:03:20 +00:00
Dave Airlie
f8ca99d697 use gart base from drm not try to work it out ourselves.. bump radeon client
to need 1.6 drm where this first appeared.. this fixes r300 on PCIE
2006-04-04 11:17:46 +00:00
Dave Airlie
6a9f0a27c3 switch to card_type rather than IsPCI, doesn't change any functionality yet 2006-04-04 11:04:30 +00:00
Michal Krol
7473d17268 Add bitset.h. 2006-04-04 10:25:23 +00:00
Michal Krol
b7339d7023 Fix texcoord interpolation for fragment shaders. 2006-04-04 10:22:05 +00:00
Michal Krol
b4e9750bf4 More GLSL code:
- add support for varyings;

GLSL fixes:
- pow was wrongly computed in x86 back-end;
2006-04-04 10:18:07 +00:00
Michal Krol
607b61a994 Bit set. 2006-04-04 10:11:12 +00:00
Michal Krol
1a5fecb4d6 Return GLSL version string (1.10). 2006-04-04 10:08:27 +00:00
Michal Krol
ae76be49eb Define MAX_VERTEX_ATTRIBS to 16. 2006-04-04 10:06:39 +00:00
Adam Jackson
3c327c9f3a Fix license header to SGI FreeB. (Eric Kunze, SGI) 2006-04-03 22:23:52 +00:00
Adam Jackson
76a0797c32 Bug #5754: Allocate texture memory correctly. (Richard Drummond) 2006-04-03 21:28:07 +00:00
Karl Schultz
a9cc078b0e Fix problem reported by Bill Newman in read_rgba_pixels for 16 and 32 bit (GDI driver). Bug would cause the wrong pixel to be read if more than one pixel requested and could cause memory access violations. 2006-04-03 16:54:25 +00:00
Brian Paul
ac619f4912 64-bit build for sunos5 w/ gcc 2006-04-03 16:09:53 +00:00
Dave Airlie
edd2702287 add miniglx sources to i915 2006-04-03 07:41:31 +00:00
Dave Airlie
225148ea07 if DDX is -1 don't do DDX check 2006-04-03 07:41:14 +00:00
Dave Airlie
a824813d22 use Width 2006-04-03 07:40:44 +00:00
Dave Airlie
5bb5a1908f add pitch support and use new Width 2006-04-03 07:40:28 +00:00
Dave Airlie
a951c80ae4 setup to use pci access, comment out size bumps,
sest xres from real width, use new -1 ddx version
2006-04-03 07:32:11 +00:00
Dave Airlie
808a678d85 do a drm lock/unlock sequence after the client close 2006-04-03 07:31:27 +00:00
Dave Airlie
d61c1cc7c9 add width to struct for width != virtual width 2006-04-03 07:30:48 +00:00
Dave Airlie
cf69d09202 make miniglx use libdrm and libpciaccess 2006-04-03 07:30:23 +00:00
Adam Jackson
b927a75979 Coverity #459: Silly off-by-one error. 2006-04-03 00:18:03 +00:00
Adam Jackson
5ab5517ba8 Coverity #468: Fill in the rest of the error_list to match the error codes
defined in glxproto.h.  Avoids reading semi-random memory (and probably
crashing) when calling __glXErrorString().
2006-04-03 00:00:53 +00:00
Adam Jackson
05ddc4a6c5 Coverity #476: Avoid walking off the end of ->vtx.attrsz, it's declared to
be _TNL_ATTRIB_MAX long so that's not a valid index (woo zero based
indexing).

This code still looks wrong though, the asymmetry between _tnl_copy_to_current
and _tnl_copy_from_current has me worried.
2006-04-02 23:51:30 +00:00
Adam Jackson
b3208c2de9 Coverity #567: Fix a memory leak on a failure path. 2006-04-02 23:17:49 +00:00
Adam Jackson
1ee92f984b Coverity #650: Fix a memory leak when near OOM. 2006-04-02 23:15:35 +00:00
Daniel Borca
75f81ad5f9 Assorted updates. 2006-04-01 13:38:45 +00:00
Daniel Borca
b100484145 Initialize renderbuffer size. 2006-04-01 13:26:31 +00:00
Dave Airlie
278736ff6f These messages really should be printed all the time, users want to
know this not have to set debug for it
2006-04-01 04:40:01 +00:00
Brian Paul
57b61638af added MD5 checksums for 6.5 files 2006-04-01 02:29:40 +00:00
Brian Paul
09b6b9e9c3 added 6.5 relnotes 2006-04-01 01:49:31 +00:00
Eric Anholt
482d9dd21d Don't index box by the box's index within numClipRects; just dereference it.
Fixes drawing with more than one cliprect. (Keith Packard)
2006-04-01 00:57:57 +00:00
Eric Anholt
9e8659f346 Call driUpdateFramebufferSize when we've found an updated DRI drawable stamp,
like other drivers.  Failure to do so resulted in incorrect buffer sizes for
resized windows.
2006-04-01 00:55:02 +00:00
Brian Paul
e3f41ce611 6.5 updates 2006-03-31 23:10:21 +00:00
Daniel Borca
3a3e63dc4f DMesa now uses OSMesa as a back-end. 2006-03-31 20:53:12 +00:00
Daniel Borca
3a46dff27d Removed empty arrays. 2006-03-31 20:49:55 +00:00
Aapo Tahkola
29d833bd52 Enough testing already 2006-03-31 18:46:33 +00:00
Brian Paul
9305cba6a7 bump version/date 2006-03-31 17:31:22 +00:00
Brian Paul
f2ad1b60c0 Dave Reveman's patch for GLX_MESA_copy_sub_buffer support 2006-03-31 15:48:04 +00:00
Brian Paul
df3d4e0bb9 Fix the fetch_texel_ci8() code to deal with floating point color palettes.
Fixes Quake on Windows bug.  (Karl Schultz)
2006-03-31 15:22:09 +00:00
Aapo Tahkola
6652dc8aac free rs300 and ban r350(according to r300.sf.net) 2006-03-31 14:11:41 +00:00
Aapo Tahkola
7da1daf0a2 make u_list adjustable 2006-03-31 10:10:45 +00:00
Karl Schultz
18b72d184c updated again for 6.5. 2006-03-31 06:54:11 +00:00
Aapo Tahkola
ef5b48dea1 warn about broken dxt 3/5 2006-03-31 03:54:36 +00:00
Aapo Tahkola
2cd4056fae Dont rely on writebacks 2006-03-31 03:50:29 +00:00
Aapo Tahkola
fb0175db93 disable r300 chips. R300_FORCE_R300 to force 2006-03-31 03:16:39 +00:00
Aapo Tahkola
aa70d92a13 More meaningful warning. 2006-03-31 03:01:28 +00:00
Eric Anholt
aba4967150 The pitches of the driRenderbuffers are in bytes, so no need to multiply by cpp.
Fixes software fallbacks. (Keith Packard)
2006-03-30 22:44:51 +00:00
Karl Schultz
174ce730c6 Clean up data structures, finishing off some of the cleanup work suggested by Brian. Now also creating two renderbuffers, so apps can now switch with glDrawBuffer. 2006-03-30 21:53:23 +00:00
Adam Jackson
48547ee129 Clarify which version of Mesa we're talking about 2006-03-30 19:26:54 +00:00
Adam Jackson
823c581f7c Revert my change from 1.37 as being bogus (see ensuing list discussion for
rationale).
2006-03-30 19:23:38 +00:00
Adam Jackson
8982697981 Update the install docs to make explicit note of libdrm version dependency.
Change pdx.fd.o to {anon,}cvs.fd.o as appropriate.
2006-03-30 19:21:20 +00:00
Adam Jackson
9542537cee Style fix, drop the explicit -ldrm from the link line. 2006-03-30 19:20:25 +00:00
Karl Schultz
c3f2c287ce Fix logic error in viewport function so that we still resize the buffers if the viewport and the window both change to the same new size. This lets the gloss demo work with the -f option. 2006-03-30 18:03:41 +00:00
Brian Paul
9e81d6ae3a When creating front/back renderbuffers, init the Red/Green/Blue/AlphaBits fields 2006-03-30 16:33:35 +00:00
Brian Paul
94d6bf883b Init the Red/Green/Blue/Alpha/Depth/StencilBits fields in driNewRenderbuffer() 2006-03-30 16:32:16 +00:00
Brian Paul
84c5d0a789 comments regarding assertions 2006-03-30 16:29:41 +00:00
Karl Schultz
dd7074736f Use [][3] for write_rgb_span_16 2006-03-30 16:26:26 +00:00
Brian Paul
ef8b89faee some comments for Darwin 2006-03-30 14:28:28 +00:00
Brian Paul
159ca321cb added glfbdev.h to MAIN_FILES 2006-03-30 14:27:25 +00:00
Brian Paul
ec83f38e2e fix bad call to FindLine() 2006-03-30 14:26:29 +00:00
Brian Paul
197d725601 added -f option for full-screeen 2006-03-30 14:25:54 +00:00
Brian Paul
693a66aea9 press '0' for glDrawBuffer(GL_NONE) 2006-03-30 14:24:58 +00:00
Brian Paul
8ea3353ec3 XMesaDrawLine macro, not currently used 2006-03-30 14:20:26 +00:00
Karl Schultz
87af12dbdc Fixes from Brian to help migrate to render buffer DD interfaces. Also fix bug in the viewport function that was using the viewport size to resize the buffer, when it should have been using the window size. Fix bug in write_rgb_span_32 where the incoming pixel data parameter was coded as a [][4] instead of [][3]. Now all the demos work correctly except singlebuffer. 2006-03-30 07:58:24 +00:00
Karl Schultz
a8c9ecfab0 Fixes from Brian 2006-03-30 07:53:15 +00:00
Dave Airlie
4ecb9f0532 Fix up some incorrect pointers and clear screen 2006-03-30 05:47:08 +00:00
Dave Airlie
8b186e3695 add initial miniglx files for i915, not integrated yet 2006-03-30 04:33:58 +00:00
Karl Schultz
e43edd3c70 Updated for Mesa 6.5 2006-03-29 23:53:43 +00:00
Brian Paul
20e15f9381 Add -ansi -pedantic flags to OPT_FLAGS. This got lost at some point. Good for catching sloppy coding. 2006-03-29 23:45:44 +00:00
Brian Paul
75a8383e8d Update the _WindowMap matrix in _mesa_set_viewport() and _mesa_DepthRange().
This is a temporary fix for the DRI drivers.
Should really only have to update the matrix via _mesa_update_state().
2006-03-29 23:44:31 +00:00
Brian Paul
920023240c put braces around RENDER_SPAN macro when called, not when defined. Fixes -pedantic warnings in x11 driver 2006-03-29 23:42:44 +00:00
Brian Paul
62c325af3f fix GETPROCADDRESS usage, remove carriage return chars (bug 6430) 2006-03-29 23:20:49 +00:00
Brian Paul
32244ac7e9 s/glslnose.c/glslnoise/ (bug 6430) 2006-03-29 23:18:13 +00:00
Kristian Høgsberg
3a6d968f37 Fixes to silence warnings in code generated by glapi scripts. 2006-03-29 22:32:38 +00:00
Karl Schultz
cec74532bf Add newest source code files to project. 2006-03-29 20:55:48 +00:00
Brian Paul
f331bb0312 added some no-op virtual destructors to silence g++ 4.0.0 warnings 2006-03-29 18:54:00 +00:00
Brian Paul
c3051df8e1 fixes from John Shell (bug 6339) 2006-03-29 18:46:46 +00:00
Brian Paul
db79d2abac minor clean-up 2006-03-29 18:41:19 +00:00
Brian Paul
c19de0b7f6 FP textures and fixes (Ewald Snel) 2006-03-29 15:21:01 +00:00
Brian Paul
e5b6eee15d fix components initialization in two places (Ewald Snel) 2006-03-29 15:17:57 +00:00
Brian Paul
006e183b6e move NumNativeAlu/TexInstruction assignments (Ewald Snel) 2006-03-29 15:15:37 +00:00
Jouk Jansen
180b0dab8b Committing in .
Removing <CR>

 Modified Files:
 	Mesa/src/mesa/main/fog.c Mesa/src/mesa/main/hint.c
 	Mesa/src/mesa/main/mtypes.h
 ----------------------------------------------------------------------
2006-03-29 12:09:08 +00:00
Brian Paul
a85fbb1d36 prep for 6.5 release 2006-03-29 04:53:02 +00:00
Brian Paul
555478fed6 New code for rendering to depth/stencil textures.
Re-org of the renderbuffer wrapper code.
2006-03-29 04:51:03 +00:00
Brian Paul
2742c4e4db new tests for GL_DEPTH_STENCIL_EXT 2006-03-29 04:48:21 +00:00
Brian Paul
2b430ef56a a few new assertions 2006-03-29 04:47:34 +00:00
Karl Schultz
b7a5a9db88 Windows makefile to easily build all demo programs. 2006-03-29 04:02:44 +00:00
Karl Schultz
888ab86f85 Repair corrupted file and remove rogue 'test' project. 2006-03-29 04:01:25 +00:00
Brian Paul
2526152a10 fix a GLuint vs GLushort test, new assertions 2006-03-29 04:01:05 +00:00
Brian Paul
519a2e7cb7 Move the computation of the viewport matrix into a new update_viewport_matrix()
function since the matrix depends on the viewport params and the framebuffer's
depth buffer resolution.
Fixes some renderbuffer / depth range issues.
This simplifies the _mesa_set_viewport() and _mesa_DepthRange() functions too.
2006-03-29 03:59:34 +00:00
Karl Schultz
b687531f69 Undef a conflicting symbol in Windows. 2006-03-29 03:42:32 +00:00
Karl Schultz
54b65e080e add showbuffer.[ch] which could be in this dir after the targets are built. 2006-03-29 03:41:38 +00:00
Karl Schultz
3076557ca3 Update for new Mesa entry points. I need to change the python script that generates this file to the new XML scheme, but for now, a manual update is OK. 2006-03-29 02:12:31 +00:00
Karl Schultz
4f21180416 Remove unneeded includes of time.h 2006-03-29 02:09:47 +00:00
Daniel Borca
c61763b5d2 Match pixel addresses with `compute_row_addresses' in RGB mode (also obey RGB/UNSIGNED_BYTE rule). 2006-03-28 21:40:14 +00:00
Roland Scheidegger
08e62a1476 fix missing *_STATECHANGE in *UpdateViewportOffset for radeon, r200 and r300 (reported by Jim Duchek). Fix some potential problems with strict-aliasing with r200 and radeon drivers in *UpdateViewportOffset, *PolygonOffset and *UpdateWindow functions (some compiler warnings about strict-aliasing remain in the codegen vertex code, and there may be more problems unnoticed by the compiler). 2006-03-28 17:22:57 +00:00
Brian Paul
0e26ca0834 updated comment about framebuffer's Visual field 2006-03-28 15:28:00 +00:00
Brian Paul
e44499480f added known issue: render to depth textures not working 2006-03-28 15:25:44 +00:00
Brian Paul
9f6ff49650 update conditional for render to GL_DEPTH_STENCIL texture, check for valid teximage before calling ctx->Driver.RenderTexture() 2006-03-28 15:24:50 +00:00
Brian Paul
c7a5d528c7 a little code movement so we don't make invalid casts from gl_renderbuffers to xmesa_renderbuffers 2006-03-28 15:21:44 +00:00
Aapo Tahkola
b8915340ea fix #6072 (Keith Whitwell) 2006-03-28 10:26:34 +00:00
Keith Whitwell
1155f64cc0 Revert merge of new/experimental code from texmem branch. 2006-03-28 07:40:57 +00:00
Brian Paul
255e8ebd58 enable GL_ARB_half_float_pixel, was GL_MESAX_half_float_pixel 2006-03-28 01:23:43 +00:00
Brian Paul
95174c4eb2 comment about byteswapping in _mesa_unpack_depth_span() 2006-03-28 01:22:48 +00:00
Roland Scheidegger
f76ff7e4a7 make allow_large_textures 1 by default for radeon and r200, and consequently enable all texture units by default on those cards (3 for radeon, 6 for r200). Fix the usually forgotten DRIVER_DATE accordingly. 2006-03-27 23:53:53 +00:00
Roland Scheidegger
96aa403cee remove unnecessary typedefs causing compiler warnings 2006-03-27 23:34:53 +00:00
Daniel Borca
004673d4d1 Disable `hidden' attribute for DJGPP 2006-03-27 17:34:31 +00:00
Daniel Borca
0ad1bda7a1 PutRowRGB was not initialized for OSMESA_RGB_565 2006-03-27 17:32:22 +00:00
Dave Airlie
e72b745f32 Fixup makefile for solo non-egl 2006-03-27 00:07:21 +00:00
Brian Paul
ea4fe661d7 merge from texman branch 2006-03-26 05:22:17 +00:00
Brian Paul
4cbd16ed3f fix some PFNGL* typedefs 2006-03-26 05:09:03 +00:00
Brian Paul
06049e2416 remove carriage returns 2006-03-25 22:52:39 +00:00
Brian Paul
753af3a206 fix issue in _mesa_free_framebuffer_data() 2006-03-25 17:57:52 +00:00
Brian Paul
70207b70c5 check for incomplete FBO in _mesa_Clear() 2006-03-25 16:16:37 +00:00
Brian Paul
1bbc203c6e Clean up the recent code related to texture_override(). Pass params in a
more logical order.
Remove a mess of stray ^M chars.
Fix a bug when checking if the texture object's format is GL_COLOR_INDEX
or GL_DEPTH_COMPONENT.  This fixes a segfault when GL_TEXTURE_BASE_LEVEL!=0.
2006-03-24 23:53:50 +00:00
Brian Paul
6494541eaa lots of debug options, some code movement, etc 2006-03-24 23:17:06 +00:00
Brian Paul
590cd26006 added some missing formats in _mesa_source/dest_buffer_exists() 2006-03-24 22:53:00 +00:00
Aapo Tahkola
ed4ab13cef Make ARB_vp backends happy with nv arl 2006-03-24 16:35:08 +00:00
Aapo Tahkola
af8d39861d secondary color fixes. 2006-03-24 16:33:34 +00:00
Brian Paul
c4f2710f9d Added -l option for explicit locking around Xlib and GLX calls in
threaded code.  Seems to improve reliability quite a bit.
2006-03-23 17:17:23 +00:00
Brian Paul
436d72e994 Added -p option to create a display connection per thread.
This seems more stabile than using one display connection for all threads.
Still get an occasional Xlib: unexpected async reply error, unfortunately.
2006-03-23 16:58:22 +00:00
Dave Airlie
d76ef5867d make solo build complete 2006-03-23 04:20:37 +00:00
Dave Airlie
0a6040dc2d fix coverity 1107: use after free 2006-03-23 04:15:29 +00:00
Dave Airlie
eab896cc21 fix coverity 926: use before NULL check 2006-03-23 04:13:37 +00:00
Brian Paul
f756924fa5 Need to check for new state and do readpixels/drawpixels clipping after
we call RENDER_START since that may involve validating the drawable and
updating its dimensions.
2006-03-22 22:02:07 +00:00
Aapo Tahkola
4fafe6390b implement arl and enable hw nv_vp. 2006-03-22 21:29:27 +00:00
Aapo Tahkola
6fc864b9e6 ARL dst idx was undefined. 2006-03-22 21:29:15 +00:00
Brian Paul
daffbe99dc GL_EXT_packed_depth_stencil should be off by default 2006-03-21 21:57:00 +00:00
Michal Krol
8995544bc9 Silencium gcc warnings. 2006-03-21 10:59:14 +00:00
Michal Krol
071357096e GLSL fixes:
- generate error on NULL pointers in glShaderSourceARB;
- reinstall program object, if current, in glLinkProgramARB;
- vertex and fragment shaders are optional in program object;
- floor asm was wrongly computed for x86 back-end;
- allow for (void) idiom in function prototypes;
- all fixed-state uniforms are updated;
- local variable initializers are working;
- implement texture* and shadow* functions for vertex processor;
- generate error if too many arguments in general constructor;
- trim unused data in general constructor;
- struct r-value field select was badly relocated;

Changes:
- add derived state gl_fog_attrib::_Scale;
- add derived state gl_light::_CosCutoffNeg;
2006-03-21 10:37:40 +00:00
Brian Paul
519b23b21f Lots of changes/fixes for rendering to framebuffer objects.
- When deleting texture objects, unbind from FBOs if necessary.
- Changed driver hooks for starting/ending render to texture.
- Now properly handle case where gl[Copy]TexImage() is called after
  glFramebufferTexture[123]D().  That didn't work before.
2006-03-20 18:51:57 +00:00
Brian Paul
4991888fa0 additional assertions and debug code for testing FBO completeness 2006-03-20 15:27:55 +00:00
Brian Paul
34bd1233a9 additional error checking to be sure source renderbuffer exists for glCopyTex[Sub]Image() 2006-03-20 15:27:33 +00:00
Brian Paul
457fb0e128 use new _mesa_sourc/dest_buffer_exists() functions 2006-03-20 15:26:20 +00:00
Brian Paul
7275d4d097 added _mesa_source/dest_buffer_exists() function to easily test if particular renderbuffers are present 2006-03-20 15:25:18 +00:00
Brian Paul
f1038f81e4 fix some buffer binding tests in _mesa_make_current() 2006-03-20 15:20:57 +00:00
Brian Paul
c27c382acc slightly improved error message 2006-03-20 15:20:30 +00:00
Aapo Tahkola
5319ed0e53 Fix texrect upload conflicts. 2006-03-20 13:37:28 +00:00
Aapo Tahkola
070f280895 Disable tnl programs when doing software vertex programs. compiz with its texrect and lighting needs was broken because of this. 2006-03-19 21:17:14 +00:00
Brian Paul
096dd541bd minor clean-ups 2006-03-19 19:07:12 +00:00
Aapo Tahkola
77174f0072 -fix texrect fallback when using vtxfmt_a (glitz, xgl, etc.)
-struct vertex_buffer to struct radeon_vertex_buffer conversion
-vertex attrib arrays did not supersede conventinal arrays when enabled
2006-03-19 18:04:12 +00:00
Brian Paul
21a4fb4137 Queries of GL_READ_BUFFER and GL_DRAW_BUFFER were still returning the
pre-GL_EXT_framebuffer_object state.  Now return the read/draw state stored
in the framebuffer objects.
2006-03-19 00:10:22 +00:00
Brian Paul
19b05d5009 Don't call Driver->Bitmap() if no image to render 2006-03-18 21:46:17 +00:00
Jouk Jansen
2d2af2dcf7 Committing in .
Mesa/src/mesa/main/imports.h : removed <CR>
 Mesa/src/mesa/shader/slang/descrip.mms : added new sources

 Modified Files:
 	Mesa/src/mesa/main/imports.h
 	Mesa/src/mesa/shader/slang/descrip.mms
 ----------------------------------------------------------------------
2006-03-17 14:38:41 +00:00
Brian Paul
eec33cc310 Init FogCoordFuncs[0..5] too, remove some unneeded #includes 2006-03-17 04:13:29 +00:00
Brian Paul
0f1d98c422 remove another test for IN_DRI_DRIVER 2006-03-17 04:10:03 +00:00
Kristian Høgsberg
724df02073 Don't use glx_ansic.h functions (__glXMemset). 2006-03-17 00:03:20 +00:00
Brian Paul
2b17741e1b added #undef GET_DISPATCH 2006-03-16 18:06:34 +00:00
Brian Paul
c6c0f94714 Moved _glapi_check_multithread() call into drivers, instead of in
_mesa_make_current().
This removes an ugly #if !defined(IN_DRI_DRIVER) from core Mesa.
2006-03-16 18:05:25 +00:00
Brian Paul
ef8653a838 finish up some loose ends in _mesa_texstore_z24_s8() 2006-03-16 04:44:00 +00:00
Brian Paul
514a15cea1 assorted code clean-ups, comments, etc. 2006-03-15 20:56:22 +00:00
Brian Paul
ac8b07b3ae remove invalid assertion in _glapi_get_dispatch(), fixes additional thread safety problem 2006-03-15 20:42:00 +00:00
Brian Paul
e660690985 Need to include glthread.h in glapi.h, not glapi.c so that GET_CURRENT_CONTEXT
is properly defined.  Fixes long-standing, but unnoticed thread safety failure.
Also, updated comments.
2006-03-15 20:31:50 +00:00
Brian Paul
30655c211c updated some printfs, added comment about sched_yield 2006-03-15 20:30:17 +00:00
Brian Paul
59e0faaa5c sync with texmem branch 2006-03-15 17:48:00 +00:00
Brian Paul
eccb6a0698 rename enums, fixes compilation breakage (Michal Krol) 2006-03-15 14:09:08 +00:00
Brian Paul
10f08cc202 use 'p' key to toggle use of GL_EXT_packed_depth_stencil 2006-03-15 01:44:03 +00:00
Brian Paul
b7e3e0d64e s/GLuint/GLushort/ in read_depth_stencil_image() 2006-03-15 01:36:52 +00:00
Brian Paul
19b8322169 init Red/Green/EtcBits = 0 in soft_renderbuffer_storage() 2006-03-14 22:39:43 +00:00
Brian Paul
2a0d441ebb Set always_array=true for glGenProgramsNV (Dave Reveman) 2006-03-14 15:41:53 +00:00
Brian Paul
15e74a6441 replace dprintf() with _glu_dprintf() (bug 6244) 2006-03-14 15:08:52 +00:00
Michal Krol
0f618b7eb7 Add slang_analyse.c and slang_library_texsample.c. 2006-03-14 11:39:58 +00:00
Michal Krol
8af48fc4d6 More GLSL code:
- add texture sampling support;
- fix assembly codegen bugs;
2006-03-14 11:23:16 +00:00
Aapo Tahkola
e9484e4085 Clean build. 2006-03-13 20:40:46 +00:00
Aapo Tahkola
a0cf4ceb36 Fix broken max mipmap leveling that was horribly wrong. 2006-03-13 18:23:19 +00:00
Stephane Marchesin
1c0230b396 Cleaned up some code, made more files compile. Renamed nv20_swtcl.* to
nv10_swtcl.*, hopefully this is the last rename (this should be, as
    NV05 really behaves differently).
2006-03-13 11:30:41 +00:00
Aapo Tahkola
5042778449 Option to init vp temps(for testing) 2006-03-10 05:30:33 +00:00
Stephane Marchesin
9ebde216cc A little work here and there 2006-03-10 01:43:39 +00:00
Brian Paul
9c32af5bb2 Add prototypes for GLX_MESA_swap_frame_usage, GLX_MESA_swap_control, and
GLX_EXT_texture_from_pixmap to silence warnings while compiling glxcmds.c
XXX: Need to add the new tokens for GLX_EXT_texture_from_pixmap!!!
2006-03-09 16:27:35 +00:00
Brian Paul
841a823d6d s/GLint/int/, to fit GLX conventions 2006-03-09 16:25:46 +00:00
Brian Paul
0d57301ba2 Instead of adding extra flags to DEFINES with +=, define EXTRA_DEFINES instead.
This eliminates a bunch of duplication in the compilation commmands.
2006-03-09 16:24:46 +00:00
Aapo Tahkola
12d51beb7e Kick VBOs out of GART if nothing else helps. 2006-03-09 06:21:17 +00:00
Aapo Tahkola
e294d938f2 Use the force Luke, use the force. 2006-03-09 04:42:45 +00:00
Dave Airlie
f1b431b265 coverity check bug fix going over end of array 2006-03-08 05:44:07 +00:00
Dave Airlie
9fc897af7a coverity checker bug: Pointer dereferenced after NULL check 2006-03-08 05:37:58 +00:00
Aapo Tahkola
d97ab9a7bd Fix broken DrawElements & DrawRangeElements. 2006-03-07 22:46:52 +00:00
Jouk Jansen
d9894e0d72 Committing in .
Update OpenVMS makefiles

 Modified Files:
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms
 ----------------------------------------------------------------------
2006-03-07 07:47:37 +00:00
Aapo Tahkola
dba9c0bafd Enable HW VBOs and other things needed by it. 2006-03-07 05:31:36 +00:00
Aapo Tahkola
ba7ea2e697 Convert to work with current DRM. + tag 2006-03-07 05:15:24 +00:00
Aapo Tahkola
50f319242b Various fallbacks, checks and tags. 2006-03-07 05:09:48 +00:00
Brian Paul
ca007cb449 just a comment for check_compatible() 2006-03-07 03:01:26 +00:00
Brian Paul
d75963d258 disable double-buffer test in check_compatible(), fixes pbuffer/visual problem 2006-03-07 02:57:04 +00:00
Brian Paul
8ee311d36d print newline in _mesa_warning() 2006-03-07 01:46:26 +00:00
Brian Paul
2e01918b55 call _mesa_update_framebuffer_visual() in _mesa_FramebufferRenderbufferEXT() to fix some minor glitches 2006-03-07 01:43:52 +00:00
Brian Paul
168a7516b1 FreeBSD updates (Pedro Giffuni) 2006-03-07 01:11:05 +00:00
Stephane Marchesin
2560e65a9a Added a missing field 2006-03-07 00:56:30 +00:00
Aapo Tahkola
c107058e7e Port r200 tex tiling code to run on r300 but keep it disabled. 2006-03-06 19:28:10 +00:00
Ian Romanick
3bca4f679a Later versions of Python handle formats like '% 5u' differently. For
whatever reason, a space is always inserted.  That is not the desired
behavior.
2006-03-06 18:31:50 +00:00
Ian Romanick
9d881ea718 Generate server-side GLX protocol decode functions using the 'make server'
target.  The environment variable XORG_BASE must be set to point to the base
of the X.org server sources where the files are to be placed.

The 7.0.0 server release already contains files generated by these scripts.
The scripts should have been committed months ago.  Sorry for the lag. :(
2006-03-06 18:30:17 +00:00
Ian Romanick
448d23331d Display the correct bug number in the information text. 2006-03-06 16:42:12 +00:00
Ian Romanick
66df1731e6 Don't try to bind to proxy texture target. This is defined by the spec to be
an error.  Since we're working with a proxy target, don't bother using real
texture data.

Add a missing new-line in an error printf.
2006-03-06 16:31:50 +00:00
Stephane Marchesin
5569c2dfae Cleaned up the software TCL code a bit. Renamed nv30_tris.[c,h] to
nv20_swtcl.[c,h].
2006-03-06 15:32:31 +00:00
Stephane Marchesin
98e1b13802 Added some NV20 support - nv_30_tris.c should probably be renamed again. 2006-03-06 12:23:24 +00:00
Stephane Marchesin
b9c4b7fc89 More work on the nv30 software tcl code 2006-03-06 01:46:24 +00:00
Ian Romanick
5820f7998a Build test for bugzilla #3050 2006-03-04 04:46:10 +00:00
Ian Romanick
780d270312 Test case for bugzilla #3050. 2006-03-04 04:44:47 +00:00
Stephane Marchesin
4af665a843 Rename nouveau_3d_reg.h to nouveau_reg.h 2006-03-03 16:10:28 +00:00
Stephane Marchesin
84a20832f1 rename nv40_tris to nv30_tris. 2006-03-03 16:08:59 +00:00
Roland Scheidegger
e1e03b32ab Use standard ARB names instead of vendor-specific NV names for the ARB/NV_vertex_program enums in common state handling code, and update comments accordingly. Change some slightly confusing code which gave the impression GL_VERTEX_PROGRAM_ARB and GL_VERTEX_PROGRAM_NV enums were different. 2006-03-03 15:03:04 +00:00
Roland Scheidegger
f8ba07a77d fix up the emit_func list in the experimental arbprogram sse code. 2006-03-03 14:11:19 +00:00
Roland Scheidegger
5e01f9a114 Fix bogus span mask in s_atifragshader.c leading to trouble when the pixel was later discarded by z test (this fixes doom3 r200 renderpath with swrast). Fix calling _swrast_alpha_test potentially leading to bogus results when Alpha Test might not be enabled. While here, don't disable deferred_texture (early z) when ATI_fragment_shader is active, as it is not necessary (for the record, this boosts doom3 swrast performance by roughly a factor of 2 (4 seconds per frame now...) with the r200 render path, might be a worthwile optimization for fragment programs which don't write z). 2006-03-03 02:46:03 +00:00
Keith Whitwell
f4ab5654d0 Add position_invarient support 2006-03-02 20:16:34 +00:00
Roland Scheidegger
da16813f43 Fix more enums defined not only by one extension when queried by glGet (GL_COLOR_SUM_EXT, GL_POINT_SPRITE_NV, GL_POINT_SPRITE_COORD_ORIGIN, GL_TRANSPOSE_CURRENT_MATRIX_ARB). Fix similar bugs (also those previously overseen dependant on NV/ARB_vertex_program) in glIsEnabled. Add missing GL_COLOR_SUM_EXT enum to glIsEnabled. 2006-03-02 12:06:57 +00:00
Brian Paul
9227bca103 added GL_EXT_framebuffer_blit, etc 2006-03-02 04:12:34 +00:00
Brian Paul
81b8aa9ecd test glBlitFramebufferEXT w/ -blit flag 2006-03-02 03:54:14 +00:00
Brian Paul
14d3ab9662 improved error msg 2006-03-02 03:51:04 +00:00
Brian Paul
904ab0c22c check FEATURE_EXT_framebuffer_blit 2006-03-02 03:46:33 +00:00
Brian Paul
afa1df5871 plug in BlitFramebuffer function 2006-03-02 03:45:28 +00:00
Brian Paul
c241d3b06a implementation of _swrast_BlitFramebuffer() 2006-03-02 03:37:18 +00:00
Stephane Marchesin
0e7e80ae10 Some small improvements. 2006-03-02 00:42:37 +00:00
Roland Scheidegger
93da673904 Fix glGet with enums which are used not only in NV_vertex_program, but other extensions too (ARB_vertex_program, ARB_fragment_program, NV_fragment_program), if no support for NV_vertex_program is present. While here, fix return value if enum is used which is not supported by the exposed extensions (GL_INVALID_ENUM instead of GL_INVALID_VALUE). Fix some compile-time #ifs depending on NV_vertex/fragment_program which should also be dependant on ARB_vertex/fragment_program. See bug #6070 2006-03-01 23:11:14 +00:00
Brian Paul
cf6be2d5bd No need for _mesa_save_error() to be public.
glVertexAttrib() w/ bad index should generate GL_INVALID_VALUE, not
GL_INVALID_ENUM.
Misc clean-ups.
2006-03-01 15:44:20 +00:00
Brian Paul
dbfd246db8 added BlitFramebuffer() support 2006-03-01 15:36:34 +00:00
Brian Paul
190e5595bc New comments. Use tuples () instead of lists [] in a few places. 2006-03-01 15:33:56 +00:00
Brian Paul
68edf28df6 added Flush in glXCopyContext() 2006-03-01 15:32:38 +00:00
Brian Paul
9b8059e536 updated comment 2006-03-01 02:09:40 +00:00
Brian Paul
6d4284e2bf Added glBlitFramebufferEXT function. 2006-03-01 02:07:50 +00:00
Brian Paul
9974540c73 remove temporary tokens, more error checks for blit function 2006-03-01 02:02:43 +00:00
Brian Paul
2c61fdafd6 added s_blit.c 2006-03-01 02:00:58 +00:00
Brian Paul
1eca891dbe _swrast_blit_framebuffer() function 2006-03-01 01:57:30 +00:00
Brian Paul
a231097609 GL_EXT_framebuffer_blit tokens/functions 2006-03-01 01:54:59 +00:00
Aapo Tahkola
fbe48ef01f Free temps when possible 2006-02-28 23:39:32 +00:00
Aapo Tahkola
71932ef85c Dont let (possibly) undefined z component reach hw as its unused 2006-02-28 23:22:48 +00:00
Aapo Tahkola
6754e17138 No need to call *_FIREVERTICES twice. 2006-02-28 23:17:00 +00:00
Aapo Tahkola
f71fd439f5 Fix aliasing bug (Benjamin Herrenschmidt) 2006-02-28 23:08:28 +00:00
Brian Paul
147f5091a1 Allow error checking to look for presence of either of two extensions.
See bug 6070.
2006-02-28 21:45:09 +00:00
Brian Paul
176dac684a only run shader on active fragments in the span 2006-02-28 15:48:43 +00:00
Brian Paul
34b60b001d check if active fragment shader for deferred texturing/shading 2006-02-28 15:48:19 +00:00
Brian Paul
3073cf21d2 check for active shader, set FRAGPROG_BIT in raster mask 2006-02-28 15:44:33 +00:00
Brian Paul
d1d4121682 silence a bunch of warnings 2006-02-27 15:45:38 +00:00
Michal Krol
9ac9605de1 More GLSL code:
- add x86 code generator;
- add full support for uniforms in ARB_shader_objects;
- add assembly instruction: global_addr;
- reorganize #includes;
- built-in uniforms accessed by index, rather than by name;
- add some entries to x86sse rtasm;
- add configurations to VC6 projects: 'Release x86' and 'Debug x86';
- #define SLANG_X86 active only on VC6 x86 builds;
- introduce code export table for a shader;
- remove GNU license from the noise library;
2006-02-27 14:41:41 +00:00
Brian Paul
c56f2c49a5 re-formated with indent. 2006-02-26 18:18:12 +00:00
Brian Paul
be42f53020 Remove need to initialize the InstSize[] array elements by just storing
the instruction size in _mesa_alloc_instruction().
2006-02-26 18:02:13 +00:00
Brian Paul
a764b7eae0 display list clean-ups 2006-02-26 17:16:37 +00:00
Roland Scheidegger
4e77669926 Add all pci ids known by ddx to radeon dri driver. Remove the entries not known by ddx (probably secondary ids, non-existant cards and similar). Add rs400 to the family enum, and configure the rv410 like a 2 quad chip (?) 2006-02-25 02:03:12 +00:00
Brian Paul
2aabdc743f fix broken _mesa_copy_context() for GL_LIGHTING_BIT 2006-02-24 18:19:11 +00:00
Brian Paul
ee2339f673 need to check for _NEW_BUFFERS in xmesa_update_state() 2006-02-24 17:58:48 +00:00
Brian Paul
228d4a6de7 Fix _mesa_copy_texture_state() so that we copy texture object bindings,
not the actual contents of texture objects.  This makes glXCopyContext()
work properly.
2006-02-24 17:16:57 +00:00
Brian Paul
1aad408b5a EXT_framebuffer_object (Dave Reveman) 2006-02-24 15:36:24 +00:00
Brian Paul
44a2e96729 include inttypes.h if __osf__ defined (Randall Hand) 2006-02-23 15:36:39 +00:00
Brian Paul
5b2ee9c1e9 update Blender link 2006-02-23 14:29:03 +00:00
Stephane Marchesin
bb390133b5 Import 2006-02-23 12:55:56 +00:00
Stephane Marchesin
0abf3937ce Initial revision 2006-02-23 12:55:56 +00:00
Brian Paul
956fff6345 add some #includes, fix some prototypes (bug 5992) 2006-02-22 16:54:05 +00:00
Brian Paul
7b6fd8a0c6 include proper header file, remove local extern declarations 2006-02-22 16:44:04 +00:00
Brian Paul
cebad151a1 add missing prototypes, use _slang_ prefix on non-static functions 2006-02-22 16:43:26 +00:00
Brian Paul
4f8b59d59b silence a variety of compiler warnings 2006-02-22 16:35:34 +00:00
Brian Paul
49ad2d4ed1 updated GLUT link 2006-02-22 15:50:57 +00:00
Michal Krol
cc1591667d More GLSL code:
- uniforms (only GetLocation, Uniform1f and Uniform4fv for now for demos);
- fix bugs and optimize array size handling;
- 2D texture sampling (needs Enable(TEXTURE_2D) to work);
- decrease built-in library assembly size by 30%.
2006-02-21 12:35:06 +00:00
Jouk Jansen
8986e36f36 Committing in .
Update OpenVMS makefiles

 Modified Files:
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2006-02-21 12:28:34 +00:00
Jeremy Kolb
fcbbdf9991 Added xcb dri config file. 2006-02-19 22:31:26 +00:00
Jeremy Kolb
97a3023c9f Remove old linux-x86-xcb (didn't do anything).
Removed reference to linux-x86-xcb and added linux-dri-xcb in Makefile.
2006-02-19 22:30:46 +00:00
Michal Krol
3654193a4d More GLSL code.
- general constructors allowed;
- implement noise functions (from Stefan Gustavson - thanks!)
- cosmetic stuff.
2006-02-18 15:11:18 +00:00
Keith Whitwell
e94be8d5c0 Fix STENCIL_WRITE_MASK defn for bug 5902 2006-02-17 17:03:14 +00:00
Aapo Tahkola
8da9f448f4 Skip ARL while we dont implement it. Fix broken nv vps but do it with software for now. 2006-02-16 19:50:40 +00:00
Roland Scheidegger
555b5fac4f Reinstate vertex format after a rasterization fallback for both r200 and radeon driver when a tcl fallback is active, fixes a blender issue with non-tcl hw (bug #5601) 2006-02-16 17:16:33 +00:00
Eric Anholt
a176bc6c17 Include dix-config.h if HAVE_DIX_CONFIG_H is defined. This will be used by the
X Server to get things like _XSERVER64 (for X headers) and NO_LIBCWRAPPER
defined consistently when its builds Mesa internally.
2006-02-15 21:03:34 +00:00
Brian Paul
ee40c4fb34 Set NumInstructions (bug 5864) 2006-02-15 15:59:37 +00:00
Brian Paul
a584e846d4 Fix a few warnings:
- nested comments (use #if 0 / #endif instead)
 - missing default clause in switch statements
 - use of possibly undefined variables
2006-02-15 15:51:01 +00:00
Michal Krol
dd02edf381 Add support for forward function declarations. 2006-02-15 11:15:16 +00:00
Michal Krol
88d994c3b2 Add fragment shader execute entry. 2006-02-15 11:12:47 +00:00
Michal Krol
50092f8f33 Add s_arbshader.c, s_arbshader.h. 2006-02-15 11:09:26 +00:00
Michal Krol
870ebefb3b Add swrast/s_arbshader.c. 2006-02-15 11:07:56 +00:00
Michal Krol
a663931204 Add arbshader stage. 2006-02-15 11:06:00 +00:00
Michal Krol
5bc35a823a Enable texcoords when program object in use. 2006-02-15 11:03:57 +00:00
Michal Krol
dc3a922cf3 Get arbfslight demo running. 2006-02-15 11:02:07 +00:00
Michal Krol
0c8e578a38 Enable GL_ARB_fragment_shader extension. 2006-02-15 11:00:15 +00:00
Michal Krol
3699751b0b Demonstrate GLSL fragment and vertex shaders. 2006-02-15 10:58:52 +00:00
Brian Paul
d5aca8bf0c remove stray 'foo' line 2006-02-15 04:10:55 +00:00
Brian Paul
0c1438d331 replace size_t * w/ unsigned int * (Jurg Billeter) 2006-02-14 15:04:45 +00:00
Brian Paul
a5033a0421 fix AIX issues (bug 5874) 2006-02-14 14:57:04 +00:00
Jouk Jansen
2189d9c96e Update OpenVMS compile support 2006-02-13 12:00:29 +00:00
Michal Krol
e7ffe4619f More glsl code. 2006-02-13 11:47:41 +00:00
Michal Krol
8a54fad6cd REVISION 3.
Remove illegal operators for overloading.
2006-02-13 11:45:57 +00:00
Michal Krol
ebcbf2f853 Cosmetic changes. 2006-02-13 11:42:48 +00:00
Michal Krol
41eeae5fb1 Delete most of the comments.
Minor tweaks with the functions.
Add experimental print functions.
2006-02-13 11:40:32 +00:00
Michal Krol
02eb9acc5e Get it running for ARB_vertex_shader.
Add experimental print functions to builtin library.
Some functionality missing:
- automatic arrays;
- general constructors;
- local variable initialization;
- texture sampling and noise;
- semantic error checking;
- function prototypes.
2006-02-13 11:38:37 +00:00
Michal Krol
44e9ccc708 Rename current_program to CurrentProgram.
Temporary vertex_shader execution code.
2006-02-13 11:31:16 +00:00
Michal Krol
adef42c88d Add tnl\t_vb_arbshader.c. 2006-02-13 11:27:33 +00:00
Michal Krol
7d376c76c9 Add tnl/t_vb_arbshader.c. 2006-02-13 11:25:43 +00:00
Michal Krol
a2ea606377 Add ARB_vertex_shader stage just before render stage.
If enabled, all other stages, except render, are disabled.
2006-02-13 11:23:36 +00:00
Michal Krol
2363fff347 Enable GL_ARB_shader_objects, GL_ARB_shading_language_100 and
GL_ARB_vertex_shader extensions.
2006-02-13 11:04:27 +00:00
Michal Krol
c92e688e15 Rename current glsl program variable. 2006-02-13 10:56:54 +00:00
Michal Krol
170f08d4b1 Add _mesa_atanf and _mesa_asinf functions. 2006-02-13 10:55:14 +00:00
Eric Anholt
91c30771b6 Add the ability to define NO_LIBCWRAPPER to avoid libcwrapper brain damage.
If it's true that libcwrapper usage isn't necessary ever in the DllLoader world,
then this code should probbaly all go away.
2006-02-11 02:59:38 +00:00
Dave Airlie
f236300e3a commit to fixup MGL namespacing for XGL 2006-02-10 21:46:17 +00:00
Aapo Tahkola
a73094cc6a Workaround problems with NWN. (Tilman Sauerbeck) 2006-02-10 17:26:44 +00:00
Brian Paul
42447365b2 remove the test for XFree86Server from prev patch (bug 5835) 2006-02-09 14:28:40 +00:00
Alan Hourihane
b77a225250 Check DDX for 1.5.0 2006-02-08 22:05:42 +00:00
Brian Paul
d93615fc1e include dix-config.h (Mike Harris) (bug 5835) 2006-02-08 14:52:06 +00:00
Brian Paul
42725d6f54 David Reveman's GLX_EXT_texture_from_pixmap extension patch 2006-02-07 00:39:56 +00:00
Dave Airlie
4cd0e24f86 add vblank support to i915 driver 2006-02-06 00:09:58 +00:00
Brian Paul
640ef7f890 EGL 1.2 tokens/functions/etc. 2006-02-05 16:39:19 +00:00
Brian Paul
63b852f4f9 fix typo 2006-02-05 16:38:33 +00:00
Brian Paul
ea970da0b6 bring in changes from 6.4 branch 2006-02-03 17:21:54 +00:00
Roland Scheidegger
e7276b7fa5 replace the texture level hack used in radeon/r200 to allow larger textures with different methods to calculate the announced maximum texture sizes. Default is still the same (that is, radeon/r200 default to not announce anything which might not fit, i830/i915 default to 1 texture must fit). Bug #5785. 2006-02-03 13:29:11 +00:00
Brian Paul
16a14510c4 use calloc instead of malloc so try_codegen field is initialized to zero (bug 5791) 2006-02-02 17:33:26 +00:00
Brian Paul
725740c7c8 add some assertions to check emit_func[] table validity 2006-02-02 14:30:16 +00:00
Roland Scheidegger
5951aab823 fix texcoord unit assertion, the right one (bug 5780) 2006-02-01 23:14:42 +00:00
Brian Paul
865ad82bb8 fix texcoord unit assertion (bug 5780) 2006-02-01 16:50:16 +00:00
Roland Scheidegger
3b6f62fc73 fix test for valid texunit in _mesa_ClientActiveTextureARB 2006-02-01 01:05:40 +00:00
Brian Paul
111281f1fc s/malloc/calloc/, fix mem leak 2006-01-31 03:00:14 +00:00
Roland Scheidegger
663138a951 fix broken assertions so dri drivers compile with -DDEBUG (replace GL_STENCIL_INDEX8 with GL_STENCIL_INDEX8_EXT). Fix potential problem with drivers which use 32bit z buffers. 2006-01-30 23:49:31 +00:00
Roland Scheidegger
a45f23bed1 fix broken assertion to make radeon driver compile with -DDEBUG... 2006-01-30 23:36:42 +00:00
Brian Paul
4b4cc650e1 updated comment 2006-01-30 17:13:19 +00:00
Brian Paul
781c54a5b8 silence warning about duplicate M_PI definition 2006-01-30 17:12:10 +00:00
Brian Paul
6a36407a00 added more tests (Pedro Maia) 2006-01-30 17:11:47 +00:00
Brian Paul
7905b19ec9 use fmod() when incrementing CubeRot 2006-01-30 15:35:35 +00:00
Michal Krol
bd8c742762 Add shader/slang/slang_compile_*.* files. 2006-01-30 14:50:01 +00:00
Michal Krol
9dc8bce88e Split slang_compile.c into several smaller files - it was just too big.
Minor fixes and cosmetic changes.
2006-01-30 14:48:42 +00:00
Brian Paul
b2006a40eb some initial EGL 1.2 work 2006-01-30 00:10:55 +00:00
Brian Paul
daf3093f28 Test glCopyTexSubImage2D by drawing gears as texture on sides of a box. 2006-01-28 00:30:07 +00:00
Brian Paul
5e9d73153c misc updates 2006-01-27 20:12:06 +00:00
Brian Paul
0b3c2a9a24 Don't do swapbuffers if -nodraw specified. Get t0 after setup code. 2006-01-27 15:44:40 +00:00
Aapo Tahkola
5594ddbcfe remove broken non arb fp path 2006-01-27 14:35:24 +00:00
Aapo Tahkola
58e4aa0ec9 missing link in the fallback chain 2006-01-27 14:09:05 +00:00
Aapo Tahkola
0fcfa1c5b0 enable hw vertex programs by default 2006-01-27 14:03:22 +00:00
Aapo Tahkola
e797bc8bbe per vp sw fallbacks 2006-01-27 13:21:47 +00:00
Aapo Tahkola
7d82d284e3 radeon driver doesnt have this so i assume we shouldnt either. 2006-01-27 13:09:59 +00:00
Aapo Tahkola
a7bd2563c3 drop all that (slow) locking stuff and make u_list per context. 2006-01-27 13:05:56 +00:00
Aapo Tahkola
875df252a7 R300_PFS_NODE_LAST_NODE -> R300_PFS_NODE_OUTPUT_COLOR 2006-01-27 12:38:20 +00:00
Aapo Tahkola
e804370014 Work around problems with t_vp_build.c 2006-01-27 12:23:26 +00:00
Aapo Tahkola
32551222bc r300UpdateTextureEnv shouldnt be called. 2006-01-27 12:18:58 +00:00
Brian Paul
77667266a7 Test glTexSubImage and glCopyTexSubImage rate.
Run with -nodraw to skip rendering of test quad to get "pure" sub-tex rate.
2006-01-26 17:35:31 +00:00
Brian Paul
32a6468014 copypixrate.c - measure the speed of glCopyPixels. 2006-01-26 16:37:47 +00:00
Aapo Tahkola
e65ad47a8f remove some testing code 2006-01-26 16:28:54 +00:00
Aapo Tahkola
edc98df891 Fix a problem where offsets from disabled tmus reach drm 2006-01-26 15:53:18 +00:00
Alan Hourihane
fbcb37cac5 remove i830 2006-01-26 08:53:32 +00:00
Brian Paul
3a5bb1729d New comments, clean-up of fields related to point/line/triangle validation. 2006-01-26 01:32:47 +00:00
Brian Paul
2219a15b06 remove unneeded init of swrast->invalidate_line/triangle 2006-01-26 01:28:00 +00:00
Brian Paul
74235b1cf1 remove the GL_HP_occlusion_test code 2006-01-26 01:27:17 +00:00
Brian Paul
f3cf636e57 WGL_ARB_extensions_string extension 2006-01-25 17:33:13 +00:00
Brian Paul
166b0ff973 added wglGetExtensionsStringARB 2006-01-25 15:05:36 +00:00
Karl Schultz
7f1274fa8b add wglGetExtensionsStringARB 2006-01-25 06:02:55 +00:00
Jerome Glisse
99da2d30eb fix using a tmp without asking for one 2006-01-24 23:04:51 +00:00
Alan Hourihane
8b1dc68662 pull in fix from 6.4 branch for XFree86Server definition 2006-01-24 21:40:53 +00:00
Aapo Tahkola
4dd8a8907e fix broken get_half & get_zero 2006-01-24 20:24:06 +00:00
Alan Hourihane
65573edd1b remove very old i830 code 2006-01-24 19:59:54 +00:00
Alan Hourihane
f3134ca7ad use front.size instead of sPriv->fbSize 2006-01-24 19:40:26 +00:00
Alan Hourihane
f7360cd42d use screen->front.map instead of pFB from libdri 2006-01-24 19:28:49 +00:00
Alan Hourihane
39c492bb14 Add Intel 945GM support
Add rotation support
(Tungsten Graphics)
2006-01-23 10:10:48 +00:00
Jerome Glisse
acd1f16b35 Do individual negetation in swizzling, thus we can
save one instruction in some case.
2006-01-21 15:16:53 +00:00
Jerome Glisse
c6f35dd8db Indent & wrap around 80 2006-01-21 13:08:46 +00:00
Aapo Tahkola
f087d60f18 Doesnt apply anymore 2006-01-21 12:48:09 +00:00
Jerome Glisse
41a874f486 Add individual component negation. 2006-01-21 11:43:37 +00:00
Aapo Tahkola
ef073b7a75 Try to tackle bug #5148 2006-01-20 21:56:52 +00:00
Aapo Tahkola
c90b569238 Sync from drm. 2006-01-20 21:16:28 +00:00
Aapo Tahkola
93a7605b1d Fix ARGB1555 component swizzling. 2006-01-20 20:48:05 +00:00
Jerome Glisse
b42d5bcaff Fix swizzling table & add struct. 2006-01-20 18:24:44 +00:00
Adam Jackson
37e86254c1 Avoid a crash when the user has enabled glVertex{,Attrib}Pointer but hasn't
filled in a valid pointer for that attribute or vertex array.
2006-01-19 18:00:38 +00:00
Adam Jackson
216f729a95 Search for makedepend in the PATH rather than hardcoding /usr/X11R6/bin 2006-01-18 20:57:02 +00:00
Adam Jackson
38da697546 Nuke the old attempt at software DRI, it's broken and awful 2006-01-18 00:29:35 +00:00
Adam Jackson
f93a228c38 Start a software-only DRI driver for use in the new accelerated indirect
world.
2006-01-18 00:22:21 +00:00
Brian Paul
1096eae18d properly free ATI fragment shaders (Tilman Sauerbeck) 2006-01-16 16:35:13 +00:00
Brian Paul
361bccb4ec Free visinfo object (Tilman Sauerbeck) 2006-01-16 16:17:18 +00:00
Michal Krol
b4f70646b4 remove some test code;
rewrite the intermediate code executor to address
64-bit platforms and global memory;
store built-in library code in a precompiled form only;
2006-01-16 12:34:16 +00:00
Michal Krol
8defce2cf1 remove slang_*_gc.h files;
rename slang_*_gc_bin.h files to slang_*_gc.h ones;
store built-in library code in a precompiled form only;
2006-01-16 12:27:22 +00:00
Aapo Tahkola
0f488bb16d Missing bits of code spotted by Tilman Sauerbeck 2006-01-15 13:53:54 +00:00
Aapo Tahkola
1bcc323857 Fix ARB_position_invariant handling 2006-01-15 00:07:11 +00:00
Adam Jackson
93d0935ef7 Fix the default target to remake readtex.o if needed 2006-01-13 16:34:00 +00:00
Aapo Tahkola
4078c647d5 namespace pollution fixes (Tilman Sauerbeck) 2006-01-13 15:11:57 +00:00
Aapo Tahkola
458479fedb Fix invalid tex coord routing and couple other small things. 2006-01-13 15:03:57 +00:00
Brian Paul
1814d6541b added a couple new assertions to help debug XGL problem 2006-01-10 15:48:56 +00:00
Aapo Tahkola
2d4ff6a8cf Missing patch from Ben Skeggs:
Lots of changes, and fixes for some badness on my behalf.

1. Disposable data used during fp compile is now per-context,
   rather than per-program to save memory.

2. Track usage of INPUT/TEMP registers from Mesa program, free
   them when no longer required so the hw temps can be re-used.

3. Changed LAST_NODE to OUTPUT_COLOR (see r300_reg.h)

4. Implemented remaining ARB_f_p instructions, with the exception
   of the trig/LIT opcodes.

5. Treat ZERO/ONE swizzles the same way as other native swizzles.

6. emit_arith changes, basically a complete re-write.  Should
   produce cleaner instructions, but no real functional changes.
   internal reg -> hw reg routines shared with emit_tex.  A bit
   messy still.
2006-01-09 22:53:38 +00:00
Aapo Tahkola
c217d5a3a8 Fix pow <small> and a very stypid bug with dummy srcs(0 equals to tmp0.x)</small>. demos/cubemap looks perfect now. 2006-01-09 20:00:03 +00:00
Aapo Tahkola
0946e0f418 Fix cube maps. 2006-01-09 19:20:46 +00:00
Aapo Tahkola
7a028bd1ca Fix node setup(from Ben Skeggs) 2006-01-09 18:31:42 +00:00
Brian Paul
d469e5e5a0 s/GLuint/GLbitfield/ 2006-01-09 17:57:47 +00:00
Brian Paul
c2901e4f4c only call xmesa_set_renderbuffer_funcs() when really necessary 2006-01-09 17:56:55 +00:00
Brian Paul
41b9756e9a check XGetGeometry() return value 2006-01-09 16:59:30 +00:00
Roland Scheidegger
8bc4dae67e cube maps on r100 require newer drm than the same feature on r200 (regression from introducing unfied initialization). Fix wrong (so far unused) family assignment for r100 cards. 2006-01-07 20:42:16 +00:00
Keith Whitwell
eda59aa87e Oops - bad file-completion typo. 2006-01-05 11:01:18 +00:00
Keith Whitwell
ca188de098 add simple test for program local parameters 2006-01-05 10:57:57 +00:00
Brian Paul
30cc822163 install GLw headers (bug 5396) 2006-01-04 20:10:16 +00:00
Brian Paul
413a49ce59 special-case Darwin (bug 4509) 2006-01-04 20:06:13 +00:00
Jerome Glisse
31be39742b Use X11_INCLUDES config macro instead of
hardcoded path in makefile.
2006-01-02 18:47:00 +00:00
Brian Paul
3086efe357 remove bogus wings3d link 2005-12-30 19:15:40 +00:00
Keith Whitwell
cabecbd314 recalculate state on drawable changes 2005-12-30 13:03:08 +00:00
Keith Whitwell
1d43e729ec properly notify driver on scissor change in MakeCurrent 2005-12-30 13:02:27 +00:00
Dave Airlie
8c137e2f94 fill out framebuffer egl stuff enable egl on R300 2005-12-30 11:18:04 +00:00
Dave Airlie
fb83a42d31 fixup stamp so driver updates drawable info 2005-12-30 10:12:26 +00:00
Dave Airlie
456a513daa add support for PCIE card to EGL, doesn't fully work yet but these changes
need to get off my hard disk
2005-12-29 00:56:01 +00:00
Dave Airlie
577d23011b add EGL to r300 makefile 2005-12-29 00:42:25 +00:00
Dave Airlie
369ae3e2c4 rv370 not rv350 2005-12-29 00:38:12 +00:00
Dave Airlie
77a7c2ad92 typo 2005-12-29 00:37:24 +00:00
Dave Airlie
4dac78463e add some card type ioctl support 2005-12-29 00:36:07 +00:00
Dave Airlie
edf570da67 use card_type not isPCI 2005-12-29 00:30:53 +00:00
Dave Airlie
49b9355020 add some r300 information 2005-12-28 23:42:41 +00:00
Dave Airlie
1b6a081885 update to new API 2005-12-23 08:42:29 +00:00
Dave Airlie
bc8390fa6c this needs to be calloced 2005-12-23 08:17:44 +00:00
Dave Airlie
ad960612ce fixup driver for some api changes 2005-12-23 07:58:24 +00:00
Aapo Tahkola
11decab34a Handle fatal case. 2005-12-18 21:40:13 +00:00
Aapo Tahkola
3ad366dff2 Drop output checking. 2005-12-17 18:59:18 +00:00
Aapo Tahkola
d57ce4a2c1 No you arent. 2005-12-17 12:28:58 +00:00
Aapo Tahkola
707343dcf5 Warn only when being enabled. 2005-12-17 12:20:51 +00:00
Aapo Tahkola
feb7221ecb I think this has been tested well enough already. 2005-12-17 12:08:41 +00:00
Aapo Tahkola
1d32fc7332 Enable CB_DPATH by default. 2005-12-17 11:59:13 +00:00
Aapo Tahkola
fd1627312d Fix (likely) typo. 2005-12-17 11:43:59 +00:00
Aapo Tahkola
e34700af7a Add some missing hooks. This should fix various little problems with window movement and 2d windows flashing on top of 3d windows. This problem was previously shadowed by r300ResetHwState as it gets called frequently. 2005-12-17 11:39:40 +00:00
Brian Paul
c9b4acfeb8 minor code movement 2005-12-17 05:37:15 +00:00
Karl Schultz
782291ab91 fix thinko in last revision. 2005-12-16 16:38:44 +00:00
Brian Paul
924fb5e916 move va_end() call (Evgeny Kotsuba) 2005-12-15 15:23:54 +00:00
Karl Schultz
841c9018b1 Work In Progress. Move some of the frame buffer, render buffer, etc init code from the create context path to the make current path, where it is lazily initialized. This didn't buy me very much except to make it look closer to the X11 driver. Fix up some of this same code to correct some errors.
The next step is to reorganize the wmesa context data structure to inherit the gl_context by containment so I can have access to the wmesa context in the update state path.  The driver is still currently not responding to changes in the Draw and Read Buffer state.
2005-12-15 01:02:37 +00:00
Brian Paul
b6d7a0c5a5 regenerate to pick up glGetQueryObject[u]i64vEXT funcs 2005-12-14 14:23:37 +00:00
Keith Whitwell
0970787228 Fix typo. 2005-12-14 09:31:25 +00:00
Brian Paul
c8d1741b78 use GLbitfield instead of GLuint 2005-12-14 03:06:16 +00:00
Brian Paul
1add059bd1 Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be
done with fragment programs nowadays.
2005-12-14 03:04:58 +00:00
Dave Airlie
c9797f6b76 fix from Roland for mipmapped compressed textures
remove some debug
2005-12-13 19:53:28 +00:00
Brian Paul
0063084804 silence warning, bug 5318 2005-12-12 15:27:55 +00:00
Keith Whitwell
40332059e4 Split _MaintainTexEnvProgram into two flags _Maintain and _Use. This
restores the ability to run the software driver with program TNL but
tradtional swrast.
2005-12-12 12:57:08 +00:00
Eric Anholt
3e1a5a38ae Regenerate for recent glapi changes (GetQueryObjecti64vEXT). 2005-12-11 07:42:37 +00:00
Brian Paul
790ab0a0b6 s/eglShowSurfaceMESA/eglShowScreenSurfaceMESA/ 2005-12-10 17:59:36 +00:00
Brian Paul
f06ce1ba71 Rename eglDRIShowSurfaceMESA.
s/_eglAddMode/_eglAddNewMode/
2005-12-10 17:56:00 +00:00
Brian Paul
98d9bb66a4 updates to match other changes elsewhere 2005-12-10 17:55:15 +00:00
Brian Paul
215aa20f5c rename eglShowSurfaceMESA, add EGL_SCREEN_POSITION_GRANULARITY_MESA 2005-12-10 17:54:36 +00:00
Brian Paul
4882279633 Some initial per-thread support.
Rename eglShowSurfaceMESA to eglShowScreenSurfaceMESA.
2005-12-10 17:54:00 +00:00
Brian Paul
b04dd5c587 Added EGL_SCREEN_POSITION_GRANULARITY_MESA query.
Rename eglShowSurfaceMESA to eglShowScreenSurfaceMESA.
2005-12-10 17:53:07 +00:00
Brian Paul
ad6f8eba00 lots of updates, mode sorting, etc 2005-12-10 17:52:11 +00:00
Brian Paul
6002d2ff4e implement config sorting for eglChooseConfig() 2005-12-10 17:51:13 +00:00
Brian Paul
21b2784ff5 'a' key to toggle animation 2005-12-08 17:49:50 +00:00
Brian Paul
5abc246f8d bump version number 2005-12-08 14:51:36 +00:00
Brian Paul
72d1bb5756 don't need LONGLONG typedefs 2005-12-08 14:50:28 +00:00
Brian Paul
91ed68b2b9 do away with 'long long' usage 2005-12-08 14:50:03 +00:00
Brian Paul
5262c225ba remove stray _ from GL[u]int64_EXT 2005-12-08 14:10:59 +00:00
Karl Schultz
1acea5f289 update for symbol export changes 2005-12-08 04:36:42 +00:00
Karl Schultz
5bdec89da5 add {} to RENDER_SPAN macro to fix compilation problem 2005-12-08 04:35:07 +00:00
Karl Schultz
59af97420e use 64-bit typedefs for portability 2005-12-08 04:34:17 +00:00
Karl Schultz
0694adaf71 add 64-bit typedefs for portability 2005-12-08 04:33:17 +00:00
Karl Schultz
4c3443b460 handle 64-bit types for Windows. 2005-12-08 04:32:02 +00:00
Karl Schultz
f2b9fa03da reapply recent changes with Visual Studio instead of direct text editing. 2005-12-08 04:30:44 +00:00
Brian Paul
0fa8c59e64 Updates for GL_EXT_timer_query:
New GLint64EXT and GLuint64EXT types (use C99's long long types).
New glGetQueryObject[u]i64vEXT() functions.
2005-12-07 14:48:19 +00:00
Karl Schultz
98bebc7212 Fix bugzilla 5253. Add {} around code in RENDER_SPAN macros when code includes a variable declaration. 2005-12-07 05:09:14 +00:00
Aapo Tahkola
abccd5b729 Make missing interpolator inputs fatal 2005-12-06 22:26:21 +00:00
Aapo Tahkola
9309ba78d1 Fix secondary color for VP's 2005-12-06 19:49:18 +00:00
Brian Paul
9580179dfb C++ fixes, mostly casts (Stephane Conversy) 2005-12-06 15:41:43 +00:00
Eric Anholt
d5179613d5 Add support for GL_EXT_secondary_color. It looks like using
NEED_SECONDARY_COLOR to turn it off/on was what we wanted -- now results look
correct using seccolor on Savage IX and Savage4.
2005-12-06 10:38:37 +00:00
Keith Whitwell
b4ebb68202 Add guard before calling ctx->Driver.BindProgram 2005-12-05 11:44:09 +00:00
Aapo Tahkola
f27c07c99e Fix AL8 2005-12-05 09:30:58 +00:00
Dave Airlie
923257fe07 update r300 drm minimum to 20 2005-12-05 01:14:13 +00:00
Dave Airlie
f93feb7aed Fix r300 rectangular texture upload and swtcl coordinate fixing same as radeon
sw tcl
2005-12-04 00:37:35 +00:00
Brian Paul
eb06704a7c Added PCI_CHIP_RV410_5E4B (Adam Kirchhoff) 2005-12-02 23:57:37 +00:00
Brian Paul
99f13343cf Fix two failures encountered when running out of memory during XImage
allocation.
Append \n to _mesa_warning() strings.
2005-12-02 19:41:43 +00:00
Brian Paul
1b3128cc9a Test sizeof(drm_handle_t) instead of LONG64 when returning handles 2005-12-02 18:17:11 +00:00
Brian Paul
8716e7570d fix _mesa_ffs() return, test for more platforms (Evgeny Kotsuba) 2005-12-02 18:06:01 +00:00
Ian Romanick
5abff7bc4d Fix build issues on x86-64 due to missing include path in
glapi_x86-64.S.

Bug: #5602
2005-12-02 00:25:06 +00:00
Keith Whitwell
c9515bf1ae Call ProgramStringNotify after creating tnl programs. 2005-12-01 14:24:37 +00:00
Keith Whitwell
bfba2705b6 Remove VB->LastClipped 2005-12-01 12:54:21 +00:00
Keith Whitwell
dd4f0d1a93 Clean up clipping somewhat
- no need to update ClipMask on generated vertices
	- remove the VB->LastClipped value

Line clipping algorithm changed and simplified somewhat.  The old one
was based on the triangle routine and probably wouldn't have recognized
lines that were clipped down to nothing (ie culled, but not by a single
plane).
2005-12-01 12:53:15 +00:00
Brian Paul
f285f0d8f6 remove uintptr_t cast 2005-12-01 01:00:13 +00:00
Brian Paul
6b25193b92 try removing need for the uintptr_t casts 2005-12-01 00:59:51 +00:00
Brian Paul
0e31e02aef Added FinishRenderTexture() device driver function to indicate when
rendering to a texture has likely completed.
Fixed refcount issue in texture renderbuffer wrapper.
2005-12-01 00:25:00 +00:00
Brian Paul
cf2702e3db added comment about glTexImage and renderbuffers 2005-12-01 00:18:49 +00:00
Brian Paul
31e739a189 get depthBits from the current drawbuffer 2005-12-01 00:15:41 +00:00
Brian Paul
94ae2b4f25 fxt1_decode_1() should not be static 2005-11-30 14:47:34 +00:00
Ian Romanick
5910dfacf1 This is a major re-work of the __indirect_glInterleavedArrays routine. The
big, ugly, error prone switch-statement is replaced with a compact table.
I also added numerous comments, including a comment explaining how the
format parameter is validated.

Explicitly pass GL_FLOAT as the type in the cases where that is the only
possible value (e.g., everywhere except the call to glColorPointer).

Validate that stride is >= 0.

Tested with all modes (including the two error modes) of
progs/tests/interleave.c.

Bug: #5001, #5058
Reviewed by: Brian Paul
2005-11-30 00:06:48 +00:00
Brian Paul
96f216565e assorted fixes for server-side direct rendering (bug 5199) 2005-11-29 23:01:43 +00:00
Brian Paul
2d8eb9eaf3 remove dri_client/ dir from tarball 2005-11-29 22:41:23 +00:00
Brian Paul
126482a12f use the files from the drm tree/package 2005-11-29 22:37:19 +00:00
Michel Dänzer
9790e641ef If the DDX driver didn't reserve any video RAM for textures, fall back to
using only GART memory for textures instead of segfaulting in the texture
management code. (Bug 5115)
2005-11-29 13:13:34 +00:00
Brian Paul
58f45fa44d added _EGLExtensions typedef 2005-11-29 04:44:33 +00:00
Brian Paul
5285c32a17 Put extension flags, string into separate struct. 2005-11-29 04:43:37 +00:00
Brian Paul
f576450cae clean up the drmGetMap/drmMap code 2005-11-29 04:18:38 +00:00
Brian Paul
4683e8e954 apparently need to load colormap after setting the mode to make it work reliably 2005-11-29 03:00:02 +00:00
Keith Whitwell
2b8e66d210 Remove the many aliases for 'struct mem_block' in mm.h 2005-11-28 13:17:15 +00:00
Keith Whitwell
aae2b8b8eb Correct author attribution of mm.h 2005-11-28 12:05:29 +00:00
Brian Paul
4f12aa5a6a check for driver_modes == NULL. Don't need driver_modes for EGL driver 2005-11-28 00:04:35 +00:00
Brian Paul
a913d9f2f7 rearrange some code to put in more logical order, misc clean-ups 2005-11-28 00:02:06 +00:00
Brian Paul
3070a581fc Lots of fixes, clean-ups, new comments, etc.
To set the FBdev video mode, need to add a \n char to the string.
2005-11-28 00:00:08 +00:00
Brian Paul
d548bf41d3 Redo _eglInitSurface() so it can be used with all surface types.
Redo _eglInitContext() to do error checking, attribute list parsing, etc.
2005-11-27 23:57:19 +00:00
Brian Paul
49b2d2e90f include stdint.h for BSD 2005-11-27 23:46:55 +00:00
Brian Paul
024b5896f0 use ADD_POINTERS macro instead of (uintptr_t) cast 2005-11-25 17:07:10 +00:00
Keith Whitwell
96bf6abb66 Use _mesa_exec_free for fp->func. 2005-11-24 10:59:10 +00:00
Brian Paul
2a76d952b8 use new _egl_api struct 2005-11-24 04:06:51 +00:00
Brian Paul
1ac1c1c423 use _egl_api struct, make some functions static 2005-11-24 04:05:27 +00:00
Brian Paul
daf585d0f0 Move all the EGL API function pointers into a new _egl_api struct. 2005-11-24 04:02:16 +00:00
Brian Paul
d2c64e0b83 report error token in message printed in _eglError() 2005-11-24 03:53:46 +00:00
Brian Paul
b1abf1ea8e change error test in _eglParseConfigAttribs() 2005-11-24 03:48:19 +00:00
Brian Paul
ff707ead2b init attribs to EGL_DONT_CARE in _eglParseConfigAttribs() 2005-11-24 03:41:56 +00:00
Aapo Tahkola
181f2b92cb Couple changes that were missed. 2005-11-23 13:02:25 +00:00
Brian Paul
023c95481b check/print EGL_SCREEN_BIT_MESA, fix eglGetDisplay() call 2005-11-23 01:45:25 +00:00
Brian Paul
957b517c4f Choose the display mode / surface size in an intelligent way.
Fix // comments.
More error checking, etc.
2005-11-23 01:44:38 +00:00
Brian Paul
39591da355 update some comments 2005-11-23 01:42:40 +00:00
Brian Paul
a3d2c69e61 fixed wrong return value in radeonShowSurfaceMESA() 2005-11-23 01:39:56 +00:00
Brian Paul
b8829facc7 change error message 2005-11-23 01:38:30 +00:00
Brian Paul
b711eb793b use _eglLog() 2005-11-23 01:38:12 +00:00
Brian Paul
f049ca4e33 New _eglLog() function to replace fprintf/printf calls for debug/info. 2005-11-23 01:37:30 +00:00
Brian Paul
9bcc9e9174 reference bug 5131 in comment in _tnl_free_vertices() 2005-11-22 23:29:27 +00:00
Brian Paul
286f3fbb3a disable freeing of fp->func, see comment (bug 5131) 2005-11-22 23:27:27 +00:00
Keith Whitwell
e6e1c3fc11 Use correct enums for program output variables. Fixes
fp/tri-depthwrite.
2005-11-22 12:20:03 +00:00
Keith Whitwell
ec1ffd9f25 track state flags which might invalidate parameter lists 2005-11-22 12:12:17 +00:00
Keith Whitwell
5a771857d9 Make sure tnl->_DoVertexFog is kept uptodate. Fixes fog in i915
driver.
2005-11-22 10:58:05 +00:00
Dave Airlie
bf44f6cfac bit 31 of this inserts a nop after the current instruction 2005-11-21 11:39:49 +00:00
Dave Airlie
1ea61b5cad get rid of some of those unknowns figured out from reg dumper 2005-11-21 11:35:36 +00:00
Brian Paul
ec770b8c60 move _mesa_init_instruction() to program.c 2005-11-20 17:57:22 +00:00
Brian Paul
1a61462318 s/Saturate/SaturateMode/ 2005-11-20 17:54:29 +00:00
Brian Paul
e31ac05223 Make Saturate a 2-bit field again, renamed to SaturateMode with three
possible values: SATURATE_OFF, SATURATE_ZERO_ONE and SATURATE_PLUS_MINUS_ONE.
2005-11-20 17:52:40 +00:00
Brian Paul
22db535776 additional clean-ups and improvements 2005-11-19 23:45:10 +00:00
Brian Paul
55194df035 remove incorrect cast 2005-11-19 23:29:18 +00:00
Brian Paul
1353ebed81 Saturate is a 1-bit boolean field 2005-11-19 23:28:55 +00:00
Brian Paul
5d7b49f7e7 Bunch of little fixes:
Fix mem leaks in _mesa_TexEnvProgramCacheDestroy().
Check if ctx->Driver.BindProgram is non-null before calling.
s/unsigned/GLuint/
Use MAX_INSTRUCTIONS instead of magic 100, check program length after it's made.
Use _mesa_init_instruction() instead of _mesa_memset().
2005-11-19 23:12:20 +00:00
Brian Paul
1ad3b7e28b call gluDeleteQuadric() to fix mem leak 2005-11-19 23:09:14 +00:00
Brian Paul
6f445a1061 in run_texnorm_stage() check if the texture unit is really enabled before trying to normalize the texcoords 2005-11-19 17:08:15 +00:00
Brian Paul
41c8eabe0f update some vars 2005-11-19 16:50:36 +00:00
Brian Paul
63d683091f No longer derive 'ati_fragment_shader' from 'program' class. Only the
program->Id and program->RefCount fields were used and ATI fragment shaders
didn't have too much in common with ARB/NV vertex/fragment programs anyway.
2005-11-19 16:43:04 +00:00
Brian Paul
430c469c5b remove #include arbfragparse.h 2005-11-19 15:44:53 +00:00
Brian Paul
47e511c36d remove #include arbfragparse.h, s/PI/M_PI/ 2005-11-19 15:42:39 +00:00
Brian Paul
9fd133511c removed arbfragparse.[ch] arbvertparse.[ch] 2005-11-19 15:37:00 +00:00
Brian Paul
8c41a14c5e Remove the _mesa_parse_arb_vertex/fragment_program() functions into
arbprogparse.c and remove arbvertparse.[ch] and arbfragparse.[ch].
Clean up quite a bit of the arb parsing code.
Rewrite parser extension code to avoid a mess of string operations every
time the parser was used.
2005-11-19 15:36:28 +00:00
Brian Paul
5754809421 update comments, remove ^M chars 2005-11-19 14:57:47 +00:00
Brian Paul
8c765ad312 move a bunch of gl2/shading language structs from mtypes.h to shaderobjects.h 2005-11-19 14:49:25 +00:00
Aapo Tahkola
ddf61bfec9 Try to detect when native support to given texture width is not available. 2005-11-18 20:53:50 +00:00
Aapo Tahkola
f31448f3c8 Fix typo causing secondary color not to work properly. 2005-11-18 18:05:19 +00:00
Aapo Tahkola
40ca5b455f Reduce stderr noise. 2005-11-18 17:57:27 +00:00
Brian Paul
311bcf5090 In _mesa_RenderbufferStorageEXT(), try to avoid needless reallocation.
Simplify _mesa_GetRenderbufferParameterivEXT() queries.
2005-11-18 02:24:14 +00:00
Brian Paul
948ab5d8a9 move _mesa_update_state() calls before error tests that depend on framebuffer completeness 2005-11-17 05:01:26 +00:00
Brian Paul
74e9a43a2a optimize drawing GL_DEPTH_STENCIL pixels into a GL_DEPTH_STENCIL renderbuffer 2005-11-17 05:00:17 +00:00
Brian Paul
5ba41dfa81 s/MEMCPY/_mesa_memcpy/ and fix typo 2005-11-17 04:51:56 +00:00
Brian Paul
11f179e01b optimize case of reading GL_DEPTH_STENCIL pixels from GL_DEPTH_STENCIL renderbuffer 2005-11-17 04:51:08 +00:00
Brian Paul
f81c78f87d delete frame/renderbuffers upon exit, more error checking 2005-11-17 02:08:10 +00:00
Brian Paul
547113c16c improved error checking in error_check_format_type() 2005-11-17 02:05:42 +00:00
Thomas Hellström
154cc16d08 Fixes for x86_64 Unichrome. 2005-11-16 19:24:00 +00:00
Thomas Hellström
0ba7be0a50 Bring in last minute 6_4 branch changes to the unichrome driver
to the trunk.
2005-11-16 17:24:26 +00:00
Brian Paul
32fe233d54 added -ds option to test GL_EXT_packed_depth_stencil with framebuffer objects 2005-11-16 14:48:11 +00:00
Brian Paul
0f29ef6092 additional comments about GL_DEPTH_STENCIL buffers 2005-11-16 04:17:20 +00:00
Brian Paul
94f70fab64 added depthstencil.[ch] 2005-11-16 04:12:08 +00:00
Brian Paul
1a5f1bdb42 Use new gl_framebuffer _Depth/_StencilBuffer fields instead of
Attachment[BUFFER_DEPTH/STENCIL].Renderbuffer.  The former may be wrappers
around combined depth/stencil renderbuffers attached at the later points.
2005-11-16 04:09:26 +00:00
Brian Paul
909e8a7abb added depthstencil.c 2005-11-16 04:06:32 +00:00
Brian Paul
847160466c Support for combined depth/stencil renderbuffers (GL_EXT_packed_depth_stencil).
depthstencil.c provides wrappers for treating depth/stencil buffers either
as regular depth or stencil renderbuffers.
2005-11-16 04:05:54 +00:00
Brian Paul
06185363dd added _mesa_new_depthstencil_renderbuffer() for combined depth/stencil buffers 2005-11-16 04:00:31 +00:00
Brian Paul
c731d6223c Added error checking in _tnl_Begin to detect incomplete framebuffer.
Set new tnl->DiscardPrimitive field to true when such error is
detected to discard the glBegin/End primitive when flushing.
Added some new comments.
2005-11-16 02:47:16 +00:00
Brian Paul
0ad64faec7 change an assertion 2005-11-16 02:00:34 +00:00
Brian Paul
738f501f73 Replace GL_POLYGON+1 with PRIM_OUTSIDE_BEGIN_END 2005-11-16 01:58:19 +00:00
Brian Paul
62620d349b add GL_INVALID_FRAMEBUFFER_OPERATION_EXT in _mesa_error() 2005-11-16 01:11:06 +00:00
Brian Paul
daeb0056df fix color interpolation problem reported on VMS 2005-11-15 15:08:03 +00:00
Brian Paul
7edf68e081 check for ctx==NULL, bug 4087 2005-11-15 14:50:55 +00:00
Brian Paul
1e134cf7e4 Fix problem in stencil_and_ztest_span() when using h/w stencil buffer.
Fix a comment typo.
Remove some unneeded #includes.
2005-11-15 04:01:29 +00:00
Ian Romanick
5ef524cd01 Two subtle things missed on the previous commit. 2005-11-15 01:55:46 +00:00
Ian Romanick
a163256cc2 Add the ability for interleave to test passing invalid format enums
and invalid stride values (see bugzilla #5058).
2005-11-15 01:46:49 +00:00
Ian Romanick
e5700a1ba3 Simple test of glInterleavedArrays functionality. 2005-11-14 23:31:05 +00:00
Brian Paul
cb6b47b795 remove unneeded RasterPosValid check 2005-11-14 18:23:56 +00:00
Brian Paul
7b98b40e47 Improve _mesa_print_program().
Added make_state_string() to produce a string from a GL state vector.
2005-11-12 23:25:49 +00:00
Brian Paul
b3c095f074 fix comment for TexSrcTarget 2005-11-12 23:24:32 +00:00
Brian Paul
662fbf8a62 Added _mesa_light() helper function so we can avoid transforming then
un-transforming light positions and spot directions when popping light
state off the attribute stack.
2005-11-12 18:58:12 +00:00
Brian Paul
ba3da6154c Added OSMesaColorClamp(), bug 4917 2005-11-12 18:44:29 +00:00
Brian Paul
e3636b4114 update an assertion 2005-11-12 17:59:05 +00:00
Brian Paul
bed8363aa6 update some assertions 2005-11-12 17:56:18 +00:00
Brian Paul
de99760bf3 Move stuff common to vertex/fragment_program into the base class, including:
Instructions, InputsRead, OutputsWritten, and Parameters.
Also, added debug functions: _mesa_print_instruction(),
_mesa_print_program_parameters() and revamp _mesa_print_program().
2005-11-12 17:53:14 +00:00
Brian Paul
77ee31930a Make _mesa_is_proxy_texture() non-static and use in a few more places.
Use COPY_4FV() where possible.
Added some comments, clean-ups.
2005-11-11 15:33:36 +00:00
Ian Romanick
0325bc6359 Support for "fragment program to C" and TCC has been removed from the
source code, so there is no reason for this config to exist.  This
fixes fdo bugzilla #5004.
2005-11-10 16:25:37 +00:00
Brian Paul
418a7dbd75 s/MAX_LIGHTS/ctx->Const.MaxLights/ and spruce up some comments 2005-11-10 16:22:56 +00:00
Brian Paul
6297799fee fix popping of GL_SPOT_DIRECTION (bug 5005) 2005-11-10 16:19:44 +00:00
Brian Paul
db40ebfbb7 remove -DMESA_DEBUG 2005-11-10 05:10:49 +00:00
Brian Paul
1984aabe83 Move code to enable FP exceptions into debug.c (set MESA_DEBUG=fpexceptions).
Get rid of MESA_DEBUG preprocessor symbol, just use DEBUG instead.
2005-11-10 05:10:25 +00:00
Brian Paul
a8446f72f4 fix popping of GL_EYE_PLANE state (bug 4996) 2005-11-09 16:52:21 +00:00
Brian Paul
a8717180d9 Bug 4996.
Replace use of FLOAT_TO_USHORT with either CLAMPED_FLOAT_TO_USHORT or
UNCLAMPED_FLOAT_TO_USHORT.  Same should be done for UBYTE, UINT, etc.
2005-11-09 16:30:50 +00:00
Brian Paul
cfca72cfb1 use UNCLAMPED_FLOAT_TO_USHORT/UBYTE in clear_rgba_buffer() (bug #4992) 2005-11-09 01:17:33 +00:00
Brian Paul
8850a7e20f Move COPY_FLOAT() macro down into glide driver.
Rewrite COPY_4FV() macro to not use COPY_FLOAT(), and use integer moves as
originally intended.
2005-11-09 00:56:51 +00:00
Ian Romanick
5374e4ba7e At keithw's request, remove all traces of the "fragment program to C" and
TCC experiment.
2005-11-08 22:54:22 +00:00
Ian Romanick
4884db6eb2 This patch adds the missing NV_vertex_program2 and NV_vertex_program3
instructions to the various internal tables.  It does not add support for
them to the parser nor does it add support for them to the program
interpreter.

It also corrects some errors in the comments in program_instruction.h.

This patch breaks the instruction union in t_vb_arbprogram.h.  The opcode
field in that union was only 6 bits.  When there were only 59+3 instructions
that worked fine. However, this patch increases the base instruction count
to 69.  This requires 7 bits.  The problem is that increasing the opcode
width to 7 bits increases the size of instruction::rsw to 33 bits.  I've
increased the size of the union to 64-bit, but this is just a temporary hack
(and probably breaks the build on some systems).
2005-11-08 22:40:26 +00:00
Brian Paul
e1a5edf083 s/_mesa_debug_fp_inst/_mesa_print_program/ 2005-11-08 14:53:24 +00:00
Brian Paul
bdd80bf819 remove _mesa_debug_fp_inst() 2005-11-08 14:52:51 +00:00
Brian Paul
0bffb1192a some initial work on upcoming GL_EXT_framebuffer_blit extension 2005-11-08 14:45:48 +00:00
Brian Paul
3e9c099088 remove a bunch of extension stuff that's in glxext.h 2005-11-08 14:44:07 +00:00
Brian Paul
02df9e1ed4 minor work in _mesa_print_program() 2005-11-08 14:42:52 +00:00
Brian Paul
832026f906 remove unneeded #includes 2005-11-08 14:41:41 +00:00
Brian Paul
beff21e7bf remove unneeded #includes 2005-11-07 17:36:34 +00:00
Brian Paul
189bbe0b8c s/_mesa_debug_fp_inst/_mesa_print_program/ 2005-11-07 16:03:46 +00:00
Brian Paul
c657d8e3e4 s/_mesa_debug_vp_inst/_mesa_print_program/ 2005-11-05 20:18:51 +00:00
Brian Paul
30d6a4bffa consolidate vertex/fragment program printing into _mesa_print_program() 2005-11-05 20:18:18 +00:00
Brian Paul
237dae74f7 use _mesa_program_file_string() and _mesa_opcode_string() 2005-11-05 19:33:13 +00:00
Brian Paul
bf41bc03c2 added _mesa_program_file_string() 2005-11-05 19:32:36 +00:00
Brian Paul
b7c87974b3 Use _mesa_opcode_string() 2005-11-05 19:24:08 +00:00
Brian Paul
c289f48342 use _mesa_num_inst_src_regs() and _mesa_opcode_string() 2005-11-05 19:16:19 +00:00
Brian Paul
b88fb724e6 use _mesa_num_inst_src_regs() instead of nr_args() 2005-11-05 19:15:27 +00:00
Brian Paul
1fcdaf1c3b added _mesa_num_inst_src_regs() and _mesa_opcode_string() 2005-11-05 19:12:36 +00:00
Brian Paul
637c375ee2 s/Negate/NegateBase/ 2005-11-05 17:23:45 +00:00
Brian Paul
9ba4ef3102 s/TexSrcIdx/TexSrcTarget/ 2005-11-05 17:18:09 +00:00
Brian Paul
7e807510d8 Unify vertex/fragment program instuctions.
Based on patch by Ian (#4967) but also unify instruction opcodes.
2005-11-05 17:10:45 +00:00
Brian Paul
73347516be remove unneeded #includes 2005-11-05 17:08:50 +00:00
Brian Paul
41c8b71871 remove unneeded #include 2005-11-05 17:07:00 +00:00
Aapo Tahkola
47adbde5e5 Fix broken build. 2005-11-05 14:49:26 +00:00
Brian Paul
8894a55d5f added MESA_GLX_ALPHA_BITS env var 2005-11-05 03:12:06 +00:00
Brian Paul
fd4395b8d1 don't need MAKE_SWIZZLE() macro 2005-11-05 03:02:28 +00:00
Brian Paul
613e1ad5d5 Replace parameter_type enum in program.[ch], use register_file enums instead. 2005-11-05 02:15:21 +00:00
Brian Paul
4d0b7618cb minor improvements in _mesa_init_teximage_fields() 2005-11-05 02:12:44 +00:00
Brian Paul
95ebb5f485 use VERT_RESULT_HPOS, VERT_BIT_POS tokens 2005-11-04 16:52:41 +00:00
Brian Paul
2cb1cf484a better ffs() function (bug 4956) 2005-11-04 16:47:22 +00:00
Brian Paul
8ff68b2bf3 just pass ctx to do_ndc_cliptest() rather than stuffing it in the arb_vp_machine struct 2005-11-04 16:43:28 +00:00
Brian Paul
c12ee99d11 MESA_GLX_ALPHA_BITS env var to force visual with alpha channel 2005-11-04 16:41:06 +00:00
Brian Paul
f805cdfedf remove unneeded HIDDEN definition (bug 4956) 2005-11-04 00:58:17 +00:00
Brian Paul
84f3ff91d9 fix MinGW problems (bug 4956) 2005-11-04 00:52:08 +00:00
Adam Jackson
d78834b306 s/dri.sourceforge.net/dri.freedesktop.org/ 2005-11-03 20:49:07 +00:00
Brian Paul
72030e0d91 Streamline code generation by using a fixed size instruction buffer in
arb_program struct.
2005-11-03 03:30:34 +00:00
Brian Paul
ccfe3d4683 use WRITEMASK_* tokens 2005-11-03 02:35:15 +00:00
Brian Paul
7ae9713a60 s/15/VERT_RESULT_MAX/ 2005-11-03 02:28:47 +00:00
Brian Paul
1624162b0c added a const, clean-up 2005-11-03 02:26:47 +00:00
Brian Paul
45cd2f9305 fix typo, minor clean-ups 2005-11-03 02:25:10 +00:00
Brian Paul
bcf4ae7816 added osdemos/ dir to DEMO_FILES 2005-11-02 21:01:26 +00:00
Brian Paul
60031ace75 implement USE_MGL_NAMESPACE for x86-64 dispatch code (Mark Bolstad) 2005-11-02 20:59:37 +00:00
Brian Paul
90ebb581e6 Rename FRAG_OUTPUT_* tokens to FRAG_RESULT_* to match vertex program convention 2005-11-02 18:06:12 +00:00
Jouk Jansen
5a02209cd2 Committing in .
Updated OpenVMS compile support (define tnl for include files)
 Modified Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 ----------------------------------------------------------------------
2005-11-02 15:24:14 +00:00
Aapo Tahkola
eda460035e Use ctx->VertexProgram._Current . 2005-11-02 14:12:52 +00:00
Aapo Tahkola
26b1c97a9d Remove some ghost code and adjust things a bit. 2005-11-02 14:07:03 +00:00
Keith Whitwell
e4894177ba More useful ARL test 2005-11-02 12:58:38 +00:00
Eric Anholt
3a5626cb84 First step of Radeon DRI unification:
- Makes all three drivers use the same screen structure and setup code, with a
  few ifdefs for the separate compilation to deal with symbols not being
  available to all drivers and the fact that we have no mechanism for dealing
  with different config options for different chip families in the same driver.
  These issues should be dealt with later.
- Introduces IS_R[123]00_CLASS(radeonScreenPtr) macro for code for taking
  different paths depending on the general class of chipset.
- Adds many new R300-class PCI IDs, though not all those listed in
  radeon_driver.c.
2005-11-02 01:15:07 +00:00
Keith Whitwell
a9b927cb6e add an arl test 2005-11-01 20:29:59 +00:00
Aapo Tahkola
a546abc8da Fix broken tnl stage. 2005-11-01 18:12:58 +00:00
Keith Whitwell
f4fbda35b0 Add a NotifyInputChanges() callback so that drivers (particularly tnl
drivers) can track when the sizes or strides of incoming VB->AttribPtr
arrays have changed.
2005-11-01 17:29:46 +00:00
Keith Whitwell
c3626a91ce Several fp and vp tweaks:
- Renumber VERT_RESULT_* values so that they match the
	  numbers of the corresponding FRAG_ATTRIB_ values.

        - Add ctx->VertexProgram._Current and FragmentProgram._Current
	  values which point to either the current client-supplied
	  program if enabled, or otherwise to the current mesa-internal
	  program.  Thus this program is always the correct one for
	  the current state, providing that the mesa flags to turn on
	  automatic generation are enabled.

	- Add callbacks to ctx->Driver.BindProgram() in texenvprogram.c
	  and t_vp_build.c so that the driver knows when the generated
	  program changes.  This is cleaner than trying to code all the
	  possible _NEW_* flags into the driver, and more precise as well.

	- Add a UsesKill flag to identify fragment programs with that
	  instruction, as these can require special treatment.

	- Move the FRAG_OUTPUT values to mtypes.h, near to similar defn's.
2005-11-01 17:25:49 +00:00
Aapo Tahkola
6aa6d440d9 Re-enable fallbacks. 2005-11-01 16:59:13 +00:00
Aapo Tahkola
e7d6bb9dc4 -Fix first frame -bug
-Use 16-bit elts in vtxfmt_a path if possible
-Optimize VSF param uploading
-return in r300DepthMask looks suspicious, use r300Enable instead
-Dont use r300ResetHwState in invalidate state(disabled, missing hooks, possible instabilities)
2005-11-01 15:52:08 +00:00
Aapo Tahkola
3cf156df2b Fix segmentation fault in _tnl_ProgramCacheDestroy(). 2005-11-01 15:43:06 +00:00
Keith Whitwell
da70bc6baa Make colors match the fp tests (really) 2005-11-01 12:22:48 +00:00
Keith Whitwell
a605d9c3de Make colors match the fp tests 2005-11-01 12:20:13 +00:00
Keith Whitwell
d9f362a667 standalone tests for vp instructions 2005-11-01 06:28:39 +00:00
Brian Paul
0505103710 Re-org and clean-up of vertx/fragment program limits (instructions,
temporaries, parameters, etc).
glGetProgramivARB() now returns all the right things.
Updated i915 and r300 code to initialize program native limits and
current program's native instruction/temporary/etc counts.
2005-11-01 04:36:33 +00:00
Brian Paul
ffec105109 fix problems found with gcc 2.96 (bug 4934) 2005-10-31 21:52:56 +00:00
Brian Paul
dcf4c17fb1 check swrast->_FogEnabled instead of ctx->Fog.Enabled 2005-10-31 19:46:55 +00:00
Aapo Tahkola
821b3dd562 Need more than 200 instructions. 2005-10-31 14:37:33 +00:00
Aapo Tahkola
37f2eaa316 Improve tnl program searching performance. 2005-10-31 14:34:32 +00:00
Brian Paul
18e7c5c5fe Simplify parse_attrib_binding().
Now only use VERT_ATTRIB_* and FRAG_ATTRIB_* tokens instead of
hard-coded numbers.
Note: previous check-in did similarly for output register parsing.
2005-10-30 21:46:00 +00:00
Brian Paul
7aebaf3deb Lots of clean-up in arb program parser.
Use new _mesa_init_fp/vp_instruction() function to initialize instructions.
2005-10-30 21:23:23 +00:00
Brian Paul
094a1ddf24 need to use absolute value for RSQ 2005-10-30 16:52:02 +00:00
Brian Paul
5d04101d18 added some assertions to catch unexpected swizzle values in cvp_emit_arg(), currently fails sometimes 2005-10-29 18:29:54 +00:00
Brian Paul
32df89e12d Use MAKE_SWIZZLE4() macro in a few more places.
Clean up the parse_extended_swizzle_mask() and parse_swizzle_mask() functions.
2005-10-29 18:26:43 +00:00
Brian Paul
5b3cf5af74 reduced swizzle comment 2005-10-29 18:18:46 +00:00
Brian Paul
1a979736a6 Free old parameter list before assigning new one. FIxes memory leak. 2005-10-29 17:07:09 +00:00
Brian Paul
5244fc6d60 added warning about use of REG_SCRATCH 2005-10-29 16:51:34 +00:00
Brian Paul
3c2f8b22b9 clean-up comments 2005-10-29 16:17:01 +00:00
Brian Paul
a2e696e521 s/lenght/length/ 2005-10-29 16:15:47 +00:00
Brian Paul
af13891dbd fix LIT bug 2005-10-29 16:05:18 +00:00
Brian Paul
4174f79b19 fix a few bugs in SWZ execution 2005-10-29 16:03:19 +00:00
Brian Paul
db02ab767f fix errors in RoughApproxPower(), do_LIT(), _tnl_program_string() 2005-10-29 15:56:53 +00:00
Brian Paul
4570364097 If parsing a program fails, don't change the vertex/fragment program object.
Specifically, don't attach a dummy program.
This change also fixes an occasional segfault.
Some code clean-ups.  Use GLboolean instead of GLuint to return pass/fail.
2005-10-29 15:52:31 +00:00
Eric Anholt
aba878d8c2 Bug #4901: Correct secondary color emission when lighting is turned off, tested
with seccolor on rv200 and r200.

Submitted by:	sroland
2005-10-29 00:27:01 +00:00
Ian Romanick
d7d41ceeb0 Add new test "texfilt". This test is a cousin to texwrap. Instead of
testing various texture wrap modes, this test examines various texture
filter modes, including anisotropic.

Add CFLAGS to a couple places in Makefile so that 32-bit builds on
64-bit archs will work correctly.
2005-10-28 18:41:03 +00:00
Brian Paul
3eec2901db Keith's fixes for RSW and XPD (need temporaries) 2005-10-28 15:40:08 +00:00
Brian Paul
86734ddae4 include tnl.h to silence warning 2005-10-28 15:22:28 +00:00
Brian Paul
b3c98e6205 Added assert that result != arg0 in do_RSW. This currently fails and needs fixing. 2005-10-28 14:41:06 +00:00
Brian Paul
b5ee368baf TNL module needs to implement ctx->Driver.ProgramStringNotify() function
so that calls to glProgramStringARB() to specify a new program causes the
TNL-attached data to get recomputed.
2005-10-28 14:32:49 +00:00
Brian Paul
f51bf9e23c add newline at end of file 2005-10-28 13:12:28 +00:00
Brian Paul
8cb2923038 don't use -Wmissing-prototypes for C++ code 2005-10-28 13:11:00 +00:00
Brian Paul
ca33e21165 silence a bunch of compiler warnings 2005-10-28 13:09:23 +00:00
Aapo Tahkola
5222c58a68 Silence gcc-4 warnings. 2005-10-28 12:43:41 +00:00
Aapo Tahkola
dc44372ba7 Fix texture mixup when two or more contexts. 2005-10-28 12:14:58 +00:00
Dave Airlie
eb171b0c10 fix missing commit for span changes 2005-10-28 12:05:25 +00:00
Dave Airlie
3b3adf3daa fix up radeon span functions using latest r200 code from Brian,
tested with reflect on 32-bit.. not sure why depthHasSurface isn't needed
2005-10-28 12:00:09 +00:00
Aapo Tahkola
a4af1119f5 Compiled arrays for vtxfmt_a path. 2005-10-28 09:28:32 +00:00
Eric Anholt
9c8f649930 GC a bit of dead code I noticed while looking at texwrap. 2005-10-28 07:00:41 +00:00
Eric Anholt
c57be49099 Correct the ordering of the blend constant color. 2005-10-28 06:15:11 +00:00
Eric Anholt
4b9f1308e5 Add support for GL_EXT_stencil_wrap, from hearing that the windows drivers did
it, and guessing that the two remaining entries in the 3-bit values were the
new funcs.  Tested with modified stencilwrap test.  Also, remove the commented
fallback stuff -- more modification to stencilwrap suggests that those issues
were just from span readback, not stencil implementation.
2005-10-27 21:21:05 +00:00
Eric Anholt
215c4c3a9c Bug #1028: Add hardware-accelerated stencil support to r128. Testing with
stencilwrap reported many issues with various modes.  Some of these were
complicated by the fact that spans are broken (Bug #1615), but some appear to be
real bugs.  However, while spans remain broken, I found that visual results were
better by avoiding fallbacks rather than avoiding just a broken stencil
implementation.  Note that this required changing the depth spans at 24+8bpp
into read-modify-write cycles.  It would be nicer as a single write with
a mask, but the kernel span blits turn off masking.

Reviewed by:	ajax
2005-10-27 20:26:24 +00:00
Eric Anholt
512c994b92 Bug #4900: Fix the non-fogcoord fog test on r100 (and rv200) at tcl_mode=1 by
flipping the signs on two factors.  While this contradicts the DDK, it matches
what r200 does, and it fixes the test.
2005-10-27 19:59:41 +00:00
Eric Anholt
170a61ec00 Add support for HW stencil spans, mirroring the depth spans support. Used for
Rage 128 stencil support.
2005-10-27 06:01:50 +00:00
Eric Anholt
2d0c92d81b Bump driver date for recent extension adds. 2005-10-27 01:46:39 +00:00
Aapo Tahkola
03833ba2ca Cover my arse. 2005-10-26 18:02:37 +00:00
Aapo Tahkola
d240b29b95 Reduce stderr noise and fix some compiler warnings. 2005-10-26 17:55:28 +00:00
Aapo Tahkola
22605caea8 Remove few outdated r200 files. 2005-10-26 17:04:15 +00:00
Aapo Tahkola
4dc3249f0d Sync with my local tree.
Changes to current operation:
-Elts are no longer converted to 16-bit format
-Cube maps
2005-10-26 16:42:06 +00:00
Aapo Tahkola
23f076ca67 Fix invalid vsf temp count for rv350. 2005-10-26 13:35:41 +00:00
Eric Anholt
5f79025e0d Fix the RGB order of the specular color emit, and turn GL_EXT_secondary_color
back on.  Tested using seccolor modified to use the blue channel instead of
green, since green stays in the same place across RGB/BGR mistakes.  Also hook
in UpdateSpecular on COLOR_EXT change, which might have resulted in missing
statechanges before.
2005-10-26 10:46:49 +00:00
Eric Anholt
f8a5898ca0 Add support for GL_EXT_fog_coord, tested using tests/fog.c. (Also, matches the
output from indirect rendering).
2005-10-26 10:11:34 +00:00
Eric Anholt
9eaed1178d Add built programs to .cvsignore. 2005-10-26 09:53:38 +00:00
Eric Anholt
896735e412 Add a fog mode (normal and fog_coord, leaner/exp/exp2 mode) testing program I
wrote for sis, which has also exposed a few bugs elsewhere.
2005-10-26 09:48:03 +00:00
Eric Anholt
2330ed08c3 Add disabled support for GL_EXT_fog_coord. While it seems correct to me, it's
not respecting the coords (or perhaps interpreting them differently?) in my
testing.  However, in the process it led to a fix of a secondary color handling
issue where it would be taken from the wrong offset, I believe, based off of
reading the r200 driver.  Also add a minor tweak to save time in the
fog-but-not-specular case.
2005-10-26 09:37:53 +00:00
Eric Anholt
a09d002bb5 Move the front.offset setting above a check to shortcut reallocating buffers if
width and height stayed the same.  Rely on front.offset pointing at the origin
in the window (rather than the origin of the front buffer), and fix the coords
in swapbuffers, which were wrong.  This is different from other drivers because
we've got a back buffer with a 0,0 origin at the window's origin, which makes it
more convenient to have the front buffer match it.
2005-10-25 21:10:28 +00:00
Eric Anholt
f1113fa99d Initial add of some (disabled) SiS 6326 drawing code integrated from Alan Cox's
last drop I saw, which was in turn based on a code drop of mine.  Texturing,
culling, and several extensions are unimplemented, and some features could
probably be improved. It's untested, but there don't appear to be regressions on
the 300-series code, so I'd like to get these bits in now so that it can be
worked on as not a huge diff.
2005-10-25 20:37:01 +00:00
Brian Paul
7e4cc1c29f updates from 6.4 branch 2005-10-24 23:33:27 +00:00
Eric Anholt
005070a62a Cut a bunch of code by not trying to precompute the blit commands and instead
just do it per blit.  No noticable performance difference (or behavior
difference, in my tests), and a significant difference in sanity.
2005-10-24 22:38:11 +00:00
Eric Anholt
7040b7ad88 In the last commit I added in a fatal error on unknown base formats so I
wouldn't get confused when adding support for new formats.  However, it resulted
in dying in texenv instead of drawing something undefined for GL_DECAL.  Do what
GLcore apparently does and just pass the fragment through.
2005-10-24 22:23:52 +00:00
Eric Anholt
f33beed330 Fix and enable GL_MESA_ycbcr_texture. Looks fine with yuvrect. I'm slightly
concerned that TEXEL_YUV422 looks like TEXEL_YVU422 and TEXEL_VUY422 looks like
TEXEL_VYU422 in yuvrect, but I'm happy enough for now.
2005-10-24 22:01:40 +00:00
Eric Anholt
81d3bf58ff Add support for GL_EXT_secondary_color, tested with seccolor test. 2005-10-24 21:30:06 +00:00
Eric Anholt
310f1551b4 Turn off the AGP dispatch path yet again, as it seems to be broken (found with
tuxracer and the upcoming support for secondary color).
2005-10-24 21:19:06 +00:00
Brian Paul
32340aea13 fragment program writing to result.depth.z was broken 2005-10-24 19:28:36 +00:00
Adam Jackson
c92adf4682 Add RV350 AQ chip. (popolon at popolon dot org) 2005-10-24 17:42:55 +00:00
Eric Anholt
414b742c97 Since we memcpy texture data synchronously to the card, idle the engine before
we start copying.  I haven't seen it go wrong before, but I'm pretty sure this
fix is correct.
2005-10-24 10:24:23 +00:00
Eric Anholt
60b639b9a6 - Add a few more hardware internal formats that are supported. Some remaining
ones require custom texstore, so they aren't done yet.
- Add YCBCR support commented out, since the yuvsquare test didn't work with
  just the bits I've added.
- Add the no-compression GL_ARB_texture_compression support.
- Add the driconf texture depth option and try to respect it.
2005-10-24 09:59:43 +00:00
Eric Anholt
971bdc193c Fix the GL_BLEND case (and remove the fallback associated with it) by converting
the float values to bytes before packing them.  Tested with texenv.
2005-10-24 09:02:07 +00:00
Eric Anholt
9e87119d87 Fix texenv by moving a misplaced check for being in fallback (should cover only
render state, not texture state).  While here, move a SIS_FIREVERTICES to a more
appropriate location, though it was harmless.
2005-10-24 08:27:30 +00:00
Eric Anholt
9192ab3f5d Add support for GL_ARB_texture_border_clamp and GL_ARB_texture_mirrored_repeat,
tested using texwrap, fixing the sourcing of border constant values (use the
bytes, not the floats!).  Remove the fallback on GL_CLAMP_TO_EDGE, which acts
properly, and add a note to GL_CLAMP about nonconformance (whcih is what the
fallback for CLAMP_TO_EDGE was probably targeting).
2005-10-24 08:02:44 +00:00
Eric Anholt
6efd595bf5 Fix a typo in a fallback string. 2005-10-24 07:21:56 +00:00
Eric Anholt
dc793d4e9a Add support for GL_EXT_stencil_wrap by guessing that the skip of two values in
the register header was meaningful.  It turns out those were the proper values
for the plain INCR/DECR ops, while what we were using as INCR/DECR were the
_WRAP versions.  Tested with stencil_wrap (didn't expose normal/_WRAP swapping)
and stencilwrap (exposed it nicely) tests.  Props to idr for poking me about
adding this.
2005-10-24 06:40:56 +00:00
Roland Scheidegger
3265585b15 disable yuv textures (GL_MESA_ycbcr_texture) on rv250 (hw bug, #2078). Change the initialization to fail if an unknown pci id is detected, instead of accepting all values which are not r100-based radeons. 2005-10-22 02:03:13 +00:00
Eric Anholt
1c04be573e Fix FreeBSD build by building libGL in the order desired, and doing a fix to my
mklib changes.
2005-10-22 01:41:40 +00:00
Brian Paul
52f686c480 fix GLX server resize/crash when resizing windows 2005-10-21 21:39:10 +00:00
Brian Paul
7d3b26022b check span.y >=0 (bug 4842) 2005-10-21 18:35:35 +00:00
Keith Whitwell
e516654dec new depth tests 2005-10-21 18:34:22 +00:00
Keith Whitwell
f28cbb6a7f simplify, remove sgi messages 2005-10-21 18:33:53 +00:00
Brian Paul
32a7ab2197 Darwin version fix (SF bug 1334274) 2005-10-21 15:39:42 +00:00
Brian Paul
54cfe69436 fix broken SWZ instruction 2005-10-21 15:22:36 +00:00
Brian Paul
b3f2e15035 fix broken KIL 2005-10-21 14:22:38 +00:00
Keith Whitwell
3a09ea919c better looking tests 2005-10-21 10:27:37 +00:00
Keith Whitwell
2ea6b800c0 Make test visible 2005-10-21 10:07:52 +00:00
Keith Whitwell
8975cbb36b Better looking test. 2005-10-21 08:34:06 +00:00
Dave Airlie
eedc45709f add the tile bits for offset, and unk bit 31 of size 2005-10-21 06:20:27 +00:00
Brian Paul
f468dfde17 restore FASTCALL stuff 2005-10-20 22:51:50 +00:00
Brian Paul
adfd5510c0 fix bad loops in TransposeMatrix[fd]() 2005-10-20 22:04:01 +00:00
Keith Whitwell
a90909e892 A bunch of little tests which exercise each ARB_fp instruction plus
a couple of other interesting cases.
2005-10-20 21:40:23 +00:00
Brian Paul
f344be793c added mm.c mm.h execmem.c 2005-10-20 21:29:32 +00:00
Brian Paul
255afe4abd fix another renderbuffer wrapping bug 2005-10-20 21:25:41 +00:00
Brian Paul
c8f86105d0 Disable the FASTCALL optimization because it still breaks server-side GLX. 2005-10-20 21:12:35 +00:00
Eric Anholt
6f980dbf21 Bump driver dates for the crasher fixes yesterday. 2005-10-20 20:11:46 +00:00
Jouk Jansen
b50a51118c descrip.mms syntax correction 2005-10-20 13:06:03 +00:00
Dave Airlie
806e25a5d9 fixes for r300_tex.c from Aapo Tahkola 2005-10-20 06:06:18 +00:00
Brian Paul
301c3dcb6c s/glut_gz2/glut_bz2/ 2005-10-19 20:26:13 +00:00
Eric Anholt
2420318cd9 Make SiS a little more like other drivers: Add SIS_DEBUG (only option being
"fall" so far) and make the fallback_force option be no_rast like other drivers.
Incidentally, makes no_rast not crash (though it still fails to render).
2005-10-19 03:23:29 +00:00
Eric Anholt
e0cb784e03 Remove some long-dead code. 2005-10-19 03:07:05 +00:00
Eric Anholt
d76c7d7d3e Fix a missed merge for idr's dispatch changes: failure to do driInitExtensions
in __driCreateNewScreen_20050727 resulted in crashing in dispatch.
2005-10-19 02:46:42 +00:00
Brian Paul
dc4070c787 updated for new mm.c, execmem.c files 2005-10-19 01:28:14 +00:00
Brian Paul
ca2db58166 s/memcpy/_mesa_memcpy/, s/FREE/_mesa_free/ 2005-10-19 01:26:48 +00:00
Eric Anholt
deadd47aab Bug #4615: Fix the SiS driver for the renderbuffer changes. Previously, all
drirenderbuffers pointed at screen offset 0 and NULL.  Instead, set up the front
buffer at startup but leave the others for later, since sis allocates them on
demand rather than using the static method of the other non-sis-descendent
drivers.  Some basic apps work, but fallbacks may be broken still.
2005-10-19 00:53:05 +00:00
Eric Anholt
bf3f0bcf80 Fix a missed merge for idr's dispatch changes: failure to do driInitExtensions
in __driCreateNewScreen_20050727 resulted in crashing in dispatch.  Rendering
remains broken.
2005-10-18 23:48:59 +00:00
Eric Anholt
b83435f53b Attempt to fix libGL on FreeBSD, where the library was being built without any
dependencies, breaking builds of third-party software.
2005-10-18 23:36:40 +00:00
Brian Paul
d99c37bca6 move _mesa_exec_malloc/free() up near other malloc/free prototypes 2005-10-18 15:02:45 +00:00
Brian Paul
1c236fd5c7 Lots of clean-ups. Replace __inline__ with INLINE macro. Use the
_mesa_calloc(), _mesa_free() functions.  Clean-up formatting, doxygen-style
comments.
2005-10-18 15:01:19 +00:00
Keith Whitwell
005469005d Add _mesa_exec_malloc() and _mesa_exec_free() for allocating
executable memory.  Based on Thomas Hellstrom's patch.
TODO: glapi.c also needs this, but cannot access this code.
2005-10-18 13:29:59 +00:00
Roland Scheidegger
05e1a49ab4 on r200, don't emit fog coords when fog isn't actually enabled. Fix bug with vtxfmt not causing a fallback when fog coords are active. 2005-10-18 13:09:53 +00:00
Brian Paul
730200303d added some header files to DRI_FILES (Donnie Berkholz) 2005-10-17 22:38:44 +00:00
Roland Scheidegger
2d61d30117 add GL_EXT_fog_coord support to radeon driver. No vtxfmt code (just uses fallback) yet. May cause a tcl fallback if fog coord is used together with separate specular lighting. Fog factors are precomputed and then submitted instead of the raw coords (chip limitation, same as on r200). 2005-10-17 00:54:12 +00:00
Roland Scheidegger
dd5a86339f fix some obvious typos in radeon_reg.h (only currently unused bits affected) 2005-10-16 22:45:59 +00:00
Roland Scheidegger
247f3b3e81 enable cube maps on radeon (#2241 on bugzilla). No vtxfmt code yet (just generates vfmt fallback). Code by Andreas Stenglein, some small adjustments by me. 2005-10-15 23:45:53 +00:00
Roland Scheidegger
ccf1378131 fix two bugs wrt calculating max possible texture sizes for texture rectangles/cube maps. 2005-10-15 01:07:59 +00:00
Roland Scheidegger
30daa75293 enable 3rd texture unit on radeon (default still 2 enabled units). Disable some multitexcoord codegen stuff noone understands to make it work. Replace most code testing explicitly for unit 0 and 1 with loops instead of adding test for unit 2, smaller/more readable code at the cost of maybe some slight performance hit. (Code provided by Andreas Stenglein, some adjustments by me.) 2005-10-13 14:30:20 +00:00
Roland Scheidegger
ed2f8635f0 make sure texture matrix is updated often enough with texture rectangles 2005-10-13 00:35:51 +00:00
Roland Scheidegger
6ff023fe3a fix potential bug when emitting elts with lots of components 2005-10-13 00:33:46 +00:00
Brian Paul
96e1ccedec remove unused _mesa_log2() (bug 4468) 2005-10-12 19:46:48 +00:00
Brian Paul
c81de36223 change includes (bug 4468) 2005-10-12 19:46:29 +00:00
Brian Paul
f525d3e139 fix GLAPI/extern problem (bug 4757) 2005-10-12 19:37:38 +00:00
Roland Scheidegger
d084c3d4dc Minor driver cleanup. Remove unnecessery/unneded radeon/r200AllocDmaRegionVerts function. No longer compile the radeon_compat stuff which was for drm 1.1 compatibility presumably but unused since about forever into the driver. 2005-10-11 17:55:54 +00:00
Ian Romanick
44b1bd7597 ifdef out some code to make glapi.c linkable in libglx.so (on the
server).  This isn't strictly needed yet, but it doesn't hurt anything
either.  However, the patches for fd.o bug #2996 require this to build.
2005-10-11 16:56:39 +00:00
Brian Paul
e7325294d0 check for PIXMAP in clip routine (SF bug 1323215) 2005-10-11 01:21:40 +00:00
Brian Paul
ac04a4fa7f fixed constant fogcoord bug (#4729) 2005-10-10 18:39:34 +00:00
Ian Romanick
8d29d463a3 Add 'get' data for glGetFramebufferAttachmentParameterivEXT enums.
Remove an extra closing parenthesis in the Linux version of the SWAP_32 macro.
2005-10-10 17:11:02 +00:00
Roland Scheidegger
1c0f11046a do not set format of the incoming vertices needed for fog_coord in the generic state functions. This is done in the vtxfmt/hwtcl/swtcl pathes respectively. 2005-10-08 23:41:20 +00:00
Roland Scheidegger
30f2d6f0cb remove code dealing with drm versions older than 1.3. The driver requires (and requests) 1.3 since quite some time already to work at all. 2005-10-08 23:36:35 +00:00
Brian Paul
b4269c07f8 change test for presence of accum buffer 2005-10-08 21:36:38 +00:00
Brian Paul
cf085db28a Query/print GL_RED/GREEN/BLUE/ALPHA_BITS 2005-10-08 14:42:51 +00:00
Brian Paul
474f28e57c Fix some issues with state updates and renderbuffers. Querying GL_RED_BITS,
etc. after calling glRenderBufferStorageEXT gave undefined results.
2005-10-08 14:41:17 +00:00
Brian Paul
81a22ef539 MATH_DEBUG changes from bug #4468. 2005-10-07 17:18:51 +00:00
Keith Whitwell
f2802c40ff Populate arb_fp_instruction negate field correctly. 2005-10-07 09:55:26 +00:00
Brian Paul
dfe7aedf84 Fix a number of point size attenuation problems.
Move size clamping into the rasterization function.
2005-10-07 03:56:29 +00:00
Roland Scheidegger
9dd973ec3b fix problems with some texgen modes by putting the chip into LOCAL_VIEWER mode for lighting (potentially causes slight misrenderings with the specular components of lights if the light model is not set for local viewer). 2005-10-05 22:40:09 +00:00
Roland Scheidegger
24a44d74b6 reverse accidentally commited part of last commit (makes it compile again...). 2005-10-05 20:28:31 +00:00
Roland Scheidegger
44dace86ea enable point sizes larger than 1 (for aliased points only) by using the hw point sprite primitive. 2005-10-05 16:15:16 +00:00
Brian Paul
26f69d87a4 fix byteswapping bug in _mesa_texstore_ycbcr() (Benjamin Herrenschmidt) 2005-10-05 13:36:05 +00:00
Roland Scheidegger
ea20c324ae fix typo in radeon_maos_arrays.c from last commit (code currently unused, that path is compile-tested only). 2005-10-05 13:09:15 +00:00
Roland Scheidegger
11f763f505 remove unneeded parameter from radeonUploadTexMatrix. 2005-10-05 12:38:07 +00:00
Roland Scheidegger
a3c8de2fa7 Remove the tcl fallback for texture rectangle (by manipulating the texture matrix) (tested with texrect). Enable texgen for r/q coordinates (tested with projtex). Fix projected texcoords when an app uses TexCoord3x and the texture matrix to save on vertex size (fixes ut2k3 shadow projectors in tcl mode). From texgenmix, all cases with all texgen or no texgen work, with the exception of texgen enabled for s/t only, this one works with hw tcl, but not with vtxfmt (suspect issues with vtxfmt), the mixed cases do not work (which is expected, and should be rare in practice), with the exception of the first one which hits a tcl fallback. 2005-10-05 11:42:44 +00:00
Brian Paul
06f606ce57 Remove _IsPowerOfTwo from gl_texture_object, not really needed. 2005-10-05 04:07:50 +00:00
Brian Paul
198a88923c s/IntFormat/InternalFormat/ and s/Format/_BaseFormat/ for gl_color_table. 2005-10-05 02:11:15 +00:00
Brian Paul
8184ec9fb6 added GL_INVALID_FRAMEBUFFER_OPERATION_EXT to gluErrorString() 2005-10-05 02:08:53 +00:00
Brian Paul
a9fc8ba756 In gl_texture_image replace IntFormat with InternalFormat and Format with
_BaseFormat to be consistant with gl_renderbuffer.
2005-10-05 01:48:07 +00:00
Brian Paul
91802fdf73 check if deleting currently bound frame/renderbuffer object 2005-10-04 16:01:02 +00:00
Brian Paul
7edf1e80bd glBindTexture changes, new assertions 2005-10-04 15:16:27 +00:00
Brian Paul
9e920fb93c fix glIsRender/FramebufferEXT() assertions 2005-10-04 15:01:51 +00:00
Brian Paul
bc6cced479 fix behaviour of glIsFrame/Renderbuffer() 2005-10-04 15:01:27 +00:00
Brian Paul
14c38b8f4f Use Visual.depthBits rather than Renderbuffer::DepthBits for depth buffer
operations.
2005-10-04 14:49:30 +00:00
Brian Paul
eb063cfa38 change initialization of renderbuffer DepthBits 2005-10-04 14:48:24 +00:00
Adam Jackson
199ef86b5e Bug #1155: Define IEEE_ONE on Super-H as well. 2005-10-03 20:02:07 +00:00
Brian Paul
a6296dd2c3 disable a warning 2005-10-03 16:11:47 +00:00
Brian Paul
071b30aba1 added a few calls to _mesa_update_framebuffer_visual() 2005-10-03 16:11:35 +00:00
Brian Paul
b0e7d850d1 finish up some missing code 2005-10-03 16:11:21 +00:00
Ian Romanick
8ef0519bbe Change the 'count' for COMPRESSED_TEXTURE_FORMATS from "?" to "-1". This
signals to the script (glX_proto_size.py) that generates the server-side
size functions that a handcoded query is needed to determine the data size.

Also do s/FOG_COORD_SOURCE/FOG_COORD_SRC/.

When initializing the count in glx_enum::__init__, cast the local property
to int.  Thanks to Python's dynamic typing, if this isn't done the type of
stored count will be a string instead of an int.
2005-10-03 15:05:40 +00:00
Ian Romanick
9a3a1497e5 Remove the non-existant --get-alias-set option from the help text.
Update printPixelFunction (which is only used to generate code for the
server-side) to use the correct method for obtaining the dimensions of the
image parameter to a function.

Only use byteswap.h when building generated code on Linux.  Elsewhere use
the (horrible!) macros from X11/misc.h.

Make sure that enums associated with the generic "Get" function get applied
to GetIntegerv, GetBooleanv, GetFloatv, and GetDoublev.
2005-10-03 14:59:26 +00:00
Brian Paul
1fc4b21eb2 check for GL_DEPTH_STENCIL_EXT 2005-10-01 16:09:45 +00:00
Brian Paul
2794507289 plug in _mesa_texstore_z24_s8() 2005-10-01 16:09:26 +00:00
Brian Paul
184a970722 added _mesa_texstore_z24_s8() 2005-10-01 16:08:27 +00:00
Brian Paul
b0a0ca8bd9 GL_EXT_packed_depth_stencil changes 2005-10-01 16:06:25 +00:00
Brian Paul
0899afae33 additional error checking for GL_EXT_packed_depth_stencil 2005-10-01 16:05:30 +00:00
Brian Paul
cef88397a6 fix an assertion 2005-10-01 16:04:38 +00:00
Brian Paul
7f78c93015 simplify the read_depth_stencil_pixels() function 2005-10-01 16:04:09 +00:00
Brian Paul
9758ef9e7b fix broken z24_s8 fetcher 2005-10-01 16:03:30 +00:00
Brian Paul
252194d74e updated comment 2005-10-01 16:03:00 +00:00
Brian Paul
31340f6645 added _mesa_pack_depth_stencil_span() 2005-10-01 16:02:38 +00:00
Brian Paul
3d61c2e778 move around some error checking 2005-10-01 16:02:11 +00:00
Brian Paul
d0529b67f4 use fmod() to prevent overflow of angle variable 2005-09-30 15:03:33 +00:00
Brian Paul
76560af99d implemented fallbacks for GL_EXT_packed_depth_stencil 2005-09-30 03:01:30 +00:00
Brian Paul
82b29819a9 minor improvements 2005-09-30 03:01:11 +00:00
Brian Paul
f493a04be0 added _swrast_get_row() 2005-09-30 03:00:03 +00:00
Brian Paul
1ad6e08090 call glFinish if drawing to front buffer 2005-09-29 18:46:27 +00:00
Brian Paul
b2404b132d implement CopyPixels for GL_DEPTH_STENCIL_EXT 2005-09-29 04:28:21 +00:00
Brian Paul
3fd819aef8 added _swrast_put_row() 2005-09-29 04:27:47 +00:00
Brian Paul
8d0edf015d Rewrite much of the pixel zoom code.
Zoomed DrawPixels of packed depth/stencil works now.
2005-09-29 03:20:15 +00:00
Brian Paul
5208867f12 add error checks for framebuffer completeness 2005-09-28 16:20:34 +00:00
Brian Paul
d95000da2f check for framebuffer completeness, code clean-up 2005-09-28 15:46:46 +00:00
Brian Paul
f7a8d8ffbb updated assertions (see bug 4590) 2005-09-28 14:20:06 +00:00
Brian Paul
1ad7b99925 Initial work for GL_EXT_packed_depth_stencil extension.
glReadPixels done, glDrawPixels mostly done.
2005-09-28 02:29:50 +00:00
Brian Paul
b955474093 change initialization of rb->DepthBits 2005-09-28 02:28:42 +00:00
Brian Paul
1b5d3d647e added GL_EXT_packed_depth_stencil 2005-09-28 02:28:00 +00:00
Brian Paul
ac3ec5096a added _mesa_scale_and_bias_depth() 2005-09-28 02:27:22 +00:00
Brian Paul
dbd0fa920e tweak glAccum error checking 2005-09-27 16:10:49 +00:00
Brian Paul
78b3b667b5 generate GL_INVALID_OPERATION in glAccum if read/draw buffers aren't the same 2005-09-27 15:52:27 +00:00
Brian Paul
99796464c5 Lift all the format/type error checking out of the _swrast_Draw/Read/CopyPixels
functions into the _mesa_Draw/Read/CopyPixels functions.
2005-09-27 01:25:24 +00:00
Brian Paul
70c3bebcde glDraw/CopyPixels of stencil data didn't obey the stencil write mask. Fixed. 2005-09-26 23:06:01 +00:00
Roland Scheidegger
afb9fb0965 remove identity check for texgen planes (which was just plain wrong). 2005-09-26 20:31:40 +00:00
Roland Scheidegger
84c9e671ed fix projective texturing for (swtcl) texture rectangles. Fix wrong argument order for texgen/texmat matrix multiplication. 2005-09-26 17:11:16 +00:00
Brian Paul
ad271b8c98 Added XMesaDrawable to xmesa_renderbuffer. Use it in a few places instead
of the XMesaPixmap field to avoid some X server-side issues with casting.
2005-09-26 00:38:00 +00:00
Dave Airlie
4aeaff2ae7 Add support for texture compression to R300 driver
This isn't perfect, texcmp still has some issues with the small textures..
but its a good start
2005-09-25 10:20:38 +00:00
Dave Airlie
310a10b0f2 add link for radeon_egl.c 2005-09-25 09:45:42 +00:00
Jouk Jansen
d997b90433 Committing in .
1) change compilation on VMS to use IEEE floating points

 2) one more problem with _mesa_sprintf solved

 Modified Files:
 	Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms
 	Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms
 	Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms
 	Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms
 	Mesa/src/mesa/array_cache/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 	Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/shader/grammar/descrip.mms
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms
 	Mesa/src/mesa/swrast_setup/descrip.mms
 	Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2005-09-23 07:03:53 +00:00
Brian Paul
79b4dbc496 remove printf 2005-09-23 03:24:27 +00:00
Brian Paul
048b13df65 Replace gl_framebuffer's _ColorReadBufferMask with _ColorReadBufferIndex,
Streamline the _mesa_update_framebuffer() function a bit.
2005-09-23 03:22:20 +00:00
Brian Paul
d5861c06f2 fix clipped glReadPixels bug 2005-09-23 02:16:49 +00:00
Brian Paul
36d9ee1828 added XOR line optimization 2005-09-23 01:42:23 +00:00
Brian Paul
6d3637849b Added a fast xor_line() function. Uses XDrawLine with GXxor mode.
Only used for front-buffer window/pixmap rendering, GL_FLAT shade model,
no Z test or other fragment operations.
2005-09-23 01:40:59 +00:00
Brian Paul
0efc17c105 Add Wrapper field to gl_renderbuffer. Used for wrapping one renderbuffer
with another, such as wrapping a hardware/win-sys RGB renderbuffer with a
software-based alpha buffer.
Previous alpha buffer wrapping was conflicting with the X driver's
xmesa_renderbuffer structure containment/inheritance.  That lead to
memory corruption.
2005-09-23 01:20:09 +00:00
Brian Paul
e5fce1694c improve the test for using software alpha buffer 2005-09-23 01:17:07 +00:00
Ian Romanick
7b01068a23 Enable GL_ARB_texture_mirrored_repeat on Savage4. Refactor the code that
sets the texture wrap mode and texture filter mode for Savage4 to the new
functions savage4_set_wrap_mode and savage4_set_filter_mode.

This was tested with texwrap and tunnel.
2005-09-22 21:25:31 +00:00
Brian Paul
676d0accf5 Replace gl_renderbuffer.ComponentSizes[] with separate RedBits, GreenBits,
BlueBits, etc fields.
2005-09-22 05:19:57 +00:00
Brian Paul
f1e2826856 When testing visual attributes, use the Draw/Read buffer, not the context. 2005-09-22 05:00:12 +00:00
Brian Paul
4fd11949f0 fix a debug message 2005-09-22 04:58:42 +00:00
Brian Paul
63016507d7 changed a renderbuffer check 2005-09-22 04:52:45 +00:00
Brian Paul
7d39e82976 s/GL_DEPTH_BITS/GL_TEXTURE_DEPTH_SIZE_ARB/ in _mesa_GetTexLevelParameteriv() 2005-09-21 21:19:22 +00:00
Brian Paul
8bdc1ae358 add missing scale factor in _swrast_read_depth_span_float() 2005-09-21 18:16:33 +00:00
Brian Paul
978ef2bb6d Remove ACCUM_BITS. 2005-09-21 03:35:08 +00:00
Brian Paul
3e37bafab0 replace GLdepth with GLuint and remove GLdepth 2005-09-21 02:47:32 +00:00
Brian Paul
4092fbd55a replace GLdepth with GLuint 2005-09-21 02:46:17 +00:00
Brian Paul
5bfb9356d6 s/programss/programs/ 2005-09-20 21:04:02 +00:00
Brian Paul
5434695017 initial check-in 2005-09-20 15:51:44 +00:00
Brian Paul
9e4e3adcf8 remove 31-bit Z buffer work-around 2005-09-20 04:47:34 +00:00
Brian Paul
8fadf8f900 change mask[] test in put_mono_row_uint() 2005-09-20 04:47:04 +00:00
Brian Paul
14570e6d7c compute z[i] as GLuint 2005-09-20 04:45:26 +00:00
Brian Paul
f39569f550 some improvements to _swrast_clear_depth_buffer() 2005-09-20 04:36:50 +00:00
Brian Paul
000abaa12d remove unneeded sizeof(GLdepth) test 2005-09-20 04:35:40 +00:00
Brian Paul
7265556b9a Change zLeft and zval to GLuint. Seems to fix 32-bit Z computation 2005-09-20 04:34:29 +00:00
Brian Paul
22607975b4 replace STENCIL_BITS with stencilMax value 2005-09-20 04:31:24 +00:00
Brian Paul
3211b28ee6 remove STENCIL_MAX 2005-09-20 04:25:03 +00:00
Brian Paul
cd81190d5c change location of ffs() code for windows 2005-09-20 02:44:40 +00:00
Brian Paul
17d6fff30c init a=0 2005-09-19 21:16:29 +00:00
Brian Paul
c650bb0b7d s/GLchan/GLubyte/, fix error string, add comment 2005-09-19 20:32:21 +00:00
Brian Paul
02237f447f updated comment 2005-09-19 20:29:34 +00:00
Brian Paul
b3aefd1cfb additional wrapper updates, bug 4468 2005-09-19 20:12:32 +00:00
Brian Paul
a01cb26a90 s/unsigned long/drm_handle_t/ to get compilation of fb driver to work 2005-09-19 17:17:58 +00:00
Brian Paul
26bb7bc025 compilation fixes, don't know if runtime works 2005-09-19 17:17:18 +00:00
Brian Paul
6707433272 Fix potential segfault when trying to read pixels outside renderbuffer bounds.
Use _swrast_get_values() which does clipping.
2005-09-16 21:15:27 +00:00
Brian Paul
82e314252f remove unused _swrast_read_depth_span() 2005-09-16 21:10:27 +00:00
Brian Paul
f2ea634c0c lots of little clean-ups, improvements 2005-09-16 21:07:48 +00:00
Brian Paul
6ae8747539 change some comments 2005-09-16 21:06:57 +00:00
Brian Paul
62a2f8cdd6 pass mask=NULL to write all pixels in clear_ci_buffer_with_masking() 2005-09-16 21:06:33 +00:00
Brian Paul
db64b60225 remove unused ctx var 2005-09-16 18:18:47 +00:00
Brian Paul
aa2069586d use mesa import wrappers, bug 4468 2005-09-16 18:14:24 +00:00
Brian Paul
3cc67cb8cd alphabetize 2005-09-16 04:18:09 +00:00
Brian Paul
aa8abf8081 Rework the texture filtering functions a bit.
No need to pass the texture unit number as an argument.
2005-09-16 04:16:48 +00:00
Brian Paul
792a1bcbe4 replace a couple macros with inlined functions 2005-09-16 01:42:07 +00:00
Brian Paul
8885b077ed more GLuint->GLbitfield changes 2005-09-16 01:41:03 +00:00
Brian Paul
e00ac11d4d Replace GLuint with GLbitfield where appropriate. Also replace GLuint
with GLboolean in a few places.
2005-09-15 05:00:45 +00:00
Brian Paul
0f540f4b04 Code clean-ups, reorg. 2005-09-15 03:58:52 +00:00
Brian Paul
e64874ac2d silence warning 2005-09-15 01:58:39 +00:00
Brian Paul
63b5b8eaff Remove a bunch texel fetch functions that can be handled by the new
adaptor functions.
2005-09-15 01:55:40 +00:00
Brian Paul
9a22b555cf updated comments 2005-09-15 01:08:24 +00:00
Brian Paul
da9f65268d New set_fetch_functions() to set a gl_texture_image's FetchTexel functions
from the gl_texture_format's functions.
Added "adaptor" functions to allow sampling a float-valued texture with
GLchans and vice versa.  This will allow trimming down the number of
texture fetch routines.
2005-09-15 01:06:19 +00:00
Brian Paul
7fb9352fe4 replace s_texture.[ch] with s_texcombine.[ch] and s_texfilter.[ch] 2005-09-15 01:00:20 +00:00
Brian Paul
55187ea63e Update includes post-splitting of s_texture.c 2005-09-15 00:58:03 +00:00
Brian Paul
2cd8791cad Split the s_texture.c file into two new files:
s_texcombine.c - for texture combining/application
  s_texfilter.c - for texture sampling/filtering
2005-09-15 00:57:00 +00:00
Brian Paul
6ce60beb28 remove unused vars 2005-09-14 18:21:05 +00:00
Brian Paul
5f16244879 remove _tnl_MakeCurrent call 2005-09-14 18:09:15 +00:00
Brian Paul
a25fe61607 initial 6.5 release notes 2005-09-14 14:34:54 +00:00
Brian Paul
b43671c8bf Remove _tnl_MakeCurrent() and the unused ctx->Driver.MakeCurrent() callback. 2005-09-14 14:32:20 +00:00
Dave Airlie
04adb70f32 fix breakage from Brians changes earlier 2005-09-14 12:08:32 +00:00
Brian Paul
a702bbfff3 clean-up some _mesa_make_current() code 2005-09-14 03:11:36 +00:00
Brian Paul
5250aa7c6a remove rm -f line 2005-09-14 02:18:43 +00:00
Brian Paul
7a534dcab1 remove .a file before creating new one 2005-09-14 02:18:09 +00:00
Brian Paul
41cf68b4cb pageflip change from radeon driver 2005-09-14 00:49:09 +00:00
Brian Paul
a400a1e404 Instead of calling _mesa_ResizeBuffersMESA() in the Viewport function,
call driUpdateFramebufferSize() when window size/position changes.
2005-09-14 00:42:33 +00:00
Brian Paul
f157e2dee4 make some funcs static 2005-09-14 00:37:10 +00:00
Brian Paul
ff9d235042 Instead of calling _mesa_ResizeBuffersMESA() in the Viewport function,
call driUpdateFramebufferSize() when window size/position changes.
2005-09-14 00:36:27 +00:00
Brian Paul
48799287b3 use mklib script to make drivers instead of gcc -shared 2005-09-14 00:33:03 +00:00
Brian Paul
a60ff20c58 updated comment 2005-09-14 00:11:30 +00:00
Brian Paul
67a8decffe make some functions static 2005-09-14 00:10:56 +00:00
Brian Paul
e42a31350d Instead of calling _mesa_ResizeBuffersMESA() in the Viewport function,
call driUpdateFramebufferSize() when we detect changes in window size/
position in radeonGetLock().
2005-09-14 00:10:27 +00:00
Brian Paul
9ae952a88c added driUpdateFramebufferSize() 2005-09-14 00:09:09 +00:00
Brian Paul
f084f60f8b Move _mesa_add_soft_renderbuffers() from framebuffer.c to renderbuffer.c
Update some comments, code, etc.
2005-09-13 23:37:50 +00:00
Brian Paul
7909dd920d update like for MD2 viewer 2005-09-13 18:18:47 +00:00
Brian Paul
56ff8ed6d8 replace semicolon with && 2005-09-13 15:04:30 +00:00
Brian Paul
363344f5b8 print version with debug info 2005-09-13 14:48:28 +00:00
Brian Paul
7bb7f97594 fix FreeBSD problem (bug 4435) 2005-09-13 13:36:47 +00:00
Eric Anholt
914ec8ef58 Fix libGL build on FreeBSD by respecting ASM_FLAGS.
Submitted by:	Diego Pettenò <flameeyes@gentoo.org>
2005-09-13 05:19:02 +00:00
Brian Paul
878c371e6c Replace ctx->Driver.StencilOp/Func/Mask() functions with
ctx->Driver.Stencil*Separate() functions.
2005-09-13 04:42:09 +00:00
Brian Paul
42c34efd23 OpenGL 2.0's two-sided stencil feature wasn't implemented correctly.
See comment near top of stencil.c for info about OpenGL 2.0 vs.
GL_EXT_stencil_two_side.
2005-09-13 02:59:53 +00:00
Brian Paul
bdf8441f80 just some reformatting 2005-09-13 02:57:07 +00:00
Brian Paul
56a2e084be Clear either 8 or 16-bit stencil buffers. 2005-09-13 02:03:06 +00:00
Brian Paul
b5932cfc9d Use GLuint/GLint intead of GLstencil for stencil state. 2005-09-13 02:02:03 +00:00
Brian Paul
a96f889a57 Move the ctx->FirstTimeCurrent initialization 2005-09-13 01:19:29 +00:00
Brian Paul
5179f671e7 init StencilOpSeparate to NULL 2005-09-13 01:17:01 +00:00
Roland Scheidegger
8d2139e513 add GL_ATI_fragment_shader support for r200 2005-09-12 23:45:05 +00:00
Brian Paul
fd9de710f5 added a return upon out-of-memory, remove a needless assignment 2005-09-12 23:18:21 +00:00
Brian Paul
f6e3234639 restore brace lost in previous check-in 2005-09-12 21:41:45 +00:00
Roland Scheidegger
f20917de5b add complete support for ATI_fragment_shader for the r200. Most of the new code is in the new file r200_fragshader.c. Reverse engeneered by Dave Airlie and me 2005-09-12 21:20:10 +00:00
Roland Scheidegger
11543624ed remove unnecessary Swizzle parameter from struct (forgotten when the code was refactored) 2005-09-12 17:21:40 +00:00
Brian Paul
28569c25f6 use ASM_API variable, bug 4415 2005-09-12 15:19:19 +00:00
Brian Paul
68d436140d make lookup_query_object() static 2005-09-12 15:05:57 +00:00
Brian Paul
758f447a17 remove rendundant r,g,b,a vars (bug 4331) 2005-09-12 13:59:29 +00:00
Dave Airlie
2745df2774 add 1002:5460 M22 X300 card 2005-09-11 04:02:41 +00:00
Dave Airlie
654286eab1 fix dri drivers build 2005-09-11 03:58:29 +00:00
Brian Paul
2eef2eca87 Silence some warnings. 2005-09-11 01:45:04 +00:00
Brian Paul
7f8cb30ccc bunch of updates 2005-09-10 16:57:22 +00:00
Brian Paul
80cef697f4 put GLUT sources into a separate tarball 2005-09-10 16:54:05 +00:00
Brian Paul
26c7e65785 Clean-up of sources/Makefile, bug 4111 2005-09-10 16:41:17 +00:00
Brian Paul
5704b8e57a fix a problem w/ color index mode when CHAN_BITS=16 2005-09-10 16:27:51 +00:00
Brian Paul
f15b499cfd make some vars static 2005-09-10 16:20:47 +00:00
Brian Paul
392c93e398 fix GLubyte/GLchan inconsistencies (bug 4331) 2005-09-10 16:19:36 +00:00
Roland Scheidegger
0ca6715ba5 new demo to test ATI_fragment_shader, not very creative but easy to know if the output is correct. Tests single-pass as well as multi-pass shader (only pseudo-dependant texture read though, and no tex coord swizzling), src and dst modifiers, src repetition, dst masks, constants, and some ops. Both shaders run succesfully with swrast as well as r200. 2005-09-10 01:02:25 +00:00
Roland Scheidegger
c53d2d0ca8 add the new drm packets needed for ATI_fragment_shader to the sanity code of the r200 and radeon driver 2005-09-10 00:31:11 +00:00
Roland Scheidegger
6c2e82b601 add reverse-engeneered register bits needed for ATI_fragment_shader (Dave Airlie, me) 2005-09-10 00:11:27 +00:00
Brian Paul
402b2bea64 Add offset and pitch fields to intelRegion. Remove frontOffset, frontPitch,
backOffset, backPitch, depthOffset, depthPitch, textureOffset fields.
2005-09-10 00:10:15 +00:00
Roland Scheidegger
036a99452d add _tnl_arb_vertex_program_stage to all drivers which already have _tnl_vertex_program_stage. Fixes crashes when using vertex programs. Tested on r200 only (fix by Keith Whitwell) 2005-09-09 23:31:31 +00:00
Brian Paul
a3dd2ce29e remove the redundant textureSize field, use tex.size instead, it's always the same value 2005-09-09 22:57:05 +00:00
Brian Paul
338cbb0e5c don't generate selection hits for glBitmap, glDraw/CopyPixels. Misc clean-ups 2005-09-09 16:40:47 +00:00
Roland Scheidegger
b346213960 fix some bugs with handling of GL_DOT4_ATI, GL_DOT3_ATI and GL_DOT2_ADD_ATI ATI_fs instructions. 2005-09-09 15:43:11 +00:00
Roland Scheidegger
95db1f0127 add missing fallback string for ARB_vertex_program 2005-09-09 12:51:38 +00:00
Roland Scheidegger
7e3be5559e Fix wrong fallback bit being set by the tcl fallback caused by ARB_vertex_program. Disable ARB_vertex_program by default - it is incredibly slow, and just plain doesn't work anyway (arbvptorus fails an assertion, arbvpmesh has bogus output) 2005-09-09 01:38:21 +00:00
Keith Whitwell
45ba4e4332 use an explicit reserved field, rather than magic number in bound 2005-09-08 21:40:10 +00:00
Brian Paul
d9b9b4b3be Fix the comment for the 'bound' field: it's a bitmask, not an index.
In driTexturesGone(), set bound = 0, not 99.
2005-09-08 18:47:36 +00:00
Keith Whitwell
b5cbaf945d Keep NumTemporaries uptodate.
Make sure oC alpha is populated when separate_specular enabled.
2005-09-08 18:45:03 +00:00
Keith Whitwell
b15f46a093 Treat NegateBase as a bitfield, not a boolean. 2005-09-08 18:36:39 +00:00
Keith Whitwell
5cf1397710 be consistent in populating NegateBase field 2005-09-08 18:35:48 +00:00
Brian Paul
4618a9bfc2 check for either GL_ARB_depth_texture or GL_SGIX_depth_texture in a few places 2005-09-08 15:28:45 +00:00
Brian Paul
f36954ec3c fix precision problem in depth clearing (bug 4395) 2005-09-08 13:55:05 +00:00
Roland Scheidegger
f4ff4d36ed fix incorrect swizzling handling. fix code so it can potentially handle implementations with less than 6 texture units correctly. 2005-09-08 13:41:54 +00:00
Jouk Jansen
21ed29598f Committing in .
Define suseconds_t for OpenVMS

 Modified Files:
 	Mesa/src/mesa/drivers/x11/xm_dd.c
 ----------------------------------------------------------------------
2005-09-08 10:05:37 +00:00
Roland Scheidegger
ce3350770c add a bunch of FLUSH_VERTICES to some of the ATI_fs functions, most notably when changing the global ati fragment shader constants. 2005-09-08 00:12:57 +00:00
Brian Paul
692147ebf7 some clean-up and re-org for renderbuffers 2005-09-07 23:28:41 +00:00
Brian Paul
526242614f some updates, but code still out of date 2005-09-07 23:26:01 +00:00
Brian Paul
ab8ef280ec new comment 2005-09-07 23:21:59 +00:00
Brian Paul
f0da327c87 minor tweaks to _mesa_ResizeBuffersMESA() 2005-09-07 23:21:40 +00:00
Roland Scheidegger
b683b0df45 fix bug with ATI_fragment_shader in swrast (need to copy all 4 values due to later applied srcRep) 2005-09-07 21:59:30 +00:00
Brian Paul
8693b70e8f try to fix renderbuffer breakage, primarily in calculate_buffer_parameters() 2005-09-07 18:32:29 +00:00
Brian Paul
eba4ff6e0a minor formatting fix 2005-09-06 21:22:16 +00:00
Brian Paul
d869a43554 added viaRenderbufferStorage() function 2005-09-06 20:42:23 +00:00
Brian Paul
20354edf35 just changes/updates to comments 2005-09-06 14:47:57 +00:00
Brian Paul
bd07168eb2 added -Wmissing-prototypes to WARN_FLAGS 2005-09-06 03:13:18 +00:00
Brian Paul
158a2aa488 Use mklib script instead of ar. Make libmesa.a instead of mesa.a 2005-09-06 03:02:01 +00:00
Brian Paul
c0b4b9fc3e remove DEFARRAY, CHECKARRAY stuff 2005-09-06 02:56:51 +00:00
Brian Paul
e2399effa0 minor clean-up of texture_combine() 2005-09-06 02:55:34 +00:00
Brian Paul
3622f4f27f don't use DEFARRAY/CHECKARRAY stuff 2005-09-06 02:44:00 +00:00
Brian Paul
fcb6a0fa3e make some functions static 2005-09-05 21:17:44 +00:00
Brian Paul
6575e37cbf make r128SpanRenderStart/Finish static 2005-09-05 21:09:22 +00:00
Brian Paul
e3c8a0c16d remove obsolete CurrentBufferBit 2005-09-05 21:04:22 +00:00
Brian Paul
3952d6d4bb remove unused var 2005-09-05 21:03:48 +00:00
Karl Schultz
f66084b834 Add support for memory contexts (Thomas Kaltofen). Cleanup compilation warnings. 2005-09-05 14:48:39 +00:00
Karl Schultz
e15c2d077a remove _swrast_DrawBuffer 2005-09-05 14:08:51 +00:00
Karl Schultz
53a3c70580 Windows mesa.def file had been moved to the drivers dir tree some time ago. This copy is not needed. 2005-09-05 14:03:41 +00:00
Karl Schultz
e81cbd876e fix var declaration so that a C compiler can build it. 2005-09-05 13:45:23 +00:00
Brian Paul
b4b040f7d8 just formatting clean-ups 2005-09-04 22:55:57 +00:00
Brian Paul
16e7aebfe3 Simplify radeonSetCliprects(). Remove the 'mode' parameter. 2005-09-04 22:20:07 +00:00
Brian Paul
87ce68e1b3 Further clean-up and simplification of the span-related functions. 2005-09-04 22:16:08 +00:00
Brian Paul
61ba6b5a74 Add new void *addr and __DRIdrawablePrivate parameters to
driNewRenderbuffer().
2005-09-04 22:13:42 +00:00
Brian Paul
6e0e6eff05 Fix UpdatePageFlipping() function. Always call driFlipRenderbuffers()
with pfCurrentPage value, in case it's initially 1 instead of 0.
2005-09-04 16:15:38 +00:00
Brian Paul
d575a4c4a1 minor clean-ups 2005-09-04 15:03:36 +00:00
Brian Paul
0cfd4f92dd replace GET_SRC_PTR, GET_DST_PTR with GET_PTR 2005-09-04 15:02:48 +00:00
Brian Paul
eae73dbd91 Use InitPointers helper 2005-09-04 15:01:33 +00:00
Brian Paul
90cfbd3dd5 Combine GET_DST_PTR and GET_SRC_PTR into just GET_PTR. 2005-09-04 15:00:04 +00:00
Brian Paul
f8cc27ecfc Added InitPointers helper function 2005-09-04 14:59:34 +00:00
Brian Paul
16f76703a5 replace assertion with a conditional return 2005-09-04 14:59:18 +00:00
Brian Paul
05aed23d1b fudge set_component_sizes() a bit, see comments 2005-09-03 17:33:16 +00:00
Brian Paul
acafeeb6dc Remove last remnants of pre-renderbuffer code. 2005-09-03 16:57:58 +00:00
Brian Paul
54be0763e1 renderbuffer updates 2005-09-03 16:55:02 +00:00
Brian Paul
2b81c8999f SetBuffer, renderbuffer changes 2005-09-03 16:54:20 +00:00
Brian Paul
6e57725061 use new InitStencil/DepthPointer functions 2005-09-03 16:49:35 +00:00
Brian Paul
b0715811e8 remove dead code 2005-09-03 16:48:48 +00:00
Brian Paul
f6540c6252 remove SetBuffer 2005-09-03 16:47:30 +00:00
Brian Paul
687918b794 SetBuffer, renderbuffer changes 2005-09-03 16:43:02 +00:00
Brian Paul
e6925b51e1 added flippedData field for page flipping, code to flip stereo color buffers 2005-09-03 16:42:19 +00:00
Brian Paul
c6262cd8c5 added SetStencil/DepthPointer functions 2005-09-03 16:41:30 +00:00
Brian Paul
3ba814ae07 remove SetBuffer(). Misc renderbuffer changes. 2005-09-03 16:40:44 +00:00
Brian Paul
7fa6c1afb9 silence misc warnings 2005-09-03 16:39:57 +00:00
Dave Airlie
624ad14a58 Check for ATI_fragment_shader enabled 2005-09-02 23:52:05 +00:00
Brian Paul
712e5042de fix some strict aliasing problems related to choosing framebuffer configs (Matthias Hopf) 2005-09-02 17:07:00 +00:00
Brian Paul
93cfdfe1ef GL_EXT_timer_query 2005-09-02 14:02:44 +00:00
Brian Paul
14520eb25e comments 2005-09-02 13:55:50 +00:00
Brian Paul
c799e9ec24 added GL_EXT_timer_query token 2005-09-02 13:43:26 +00:00
Brian Paul
4fb995084e Prototype implementation of new GL_EXT_timer_query extension (not finalized yet).
Extends the query mechanism to query elapsed time while rendering.
2005-09-02 13:42:49 +00:00
Brian Paul
8cdf372946 replace -1 with PROGRAM_UNDEFINED when initializing instructions 2005-09-02 13:40:09 +00:00
Brian Paul
350a167635 set depthHasSurface for stencil renderbuffer 2005-09-02 13:20:20 +00:00
Roland Scheidegger
3c450b2917 ATI_fragment_shader fixes: fix bug in passTexCoord (caused by recent changes). Fix sampling from wrong texture unit. Apply swizzling before texture sampling, and hopefully get non-projected coordinates from swrast. (still does not work at all with sw doom3, way too dark just the same as with the doom3 arb2 path) 2005-09-02 12:05:38 +00:00
Brian Paul
a02febb8cc change scratch pointer from _int32_t to u_int32_t to silence warning. Is this field actually used for anything? 2005-09-02 03:39:31 +00:00
Brian Paul
a517cc1ef6 remove unneeded assertion in stencil/depth LOCAL_DEPTH_VARS code 2005-09-02 03:36:41 +00:00
Brian Paul
b343f06a09 set depthHasSurface field for stencil renderbuffer 2005-09-02 03:28:08 +00:00
Roland Scheidegger
f519a770d0 add error checking to the GL_ATI_FRAGMENT_SHADER entrypoints. Fix bug with scope of ati fragment shader constants. Fix issues with specifying color/alpha instructions not pair-wise. Change internal representation of the shader (to better fit how the extension works, should make driver implementations simpler, and saves some memory). (still doesn't work correctly with doom3 and swrast, but not worse than before) 2005-09-02 01:11:53 +00:00
Brian Paul
b252e0f47f added an assertion to help debug broken stencil readback 2005-09-01 20:14:50 +00:00
Brian Paul
238de2db12 added driFlipRenderbuffers() 2005-09-01 20:11:32 +00:00
Brian Paul
da84f0b642 fix page flipping breakage 2005-09-01 20:10:17 +00:00
Brian Paul
98e92d261b fix typo 2005-09-01 14:04:45 +00:00
Brian Paul
4d11d45d84 some missing renderbuffer changes (Roland) 2005-09-01 14:04:32 +00:00
Brian Paul
fcbfeb5d28 Finish up some of the gl_renderbuffer work.
Use driRenderbuffer's offset, pitch fields in the span routines.
Remove the SetBuffer driver function.
Consolidate the code for setting CTX_RB3D_COLOROFFSET and CTX_RB3D_COLORPITCH
state in new radeonUpdateDrawBuffer() function.
Old code is surrounded by #if 000 / #endif, temporarily.
2005-09-01 04:03:44 +00:00
Brian Paul
982e8e4d5c Finish up some of the gl_renderbuffer work.
Use driRenderbuffer's offset, pitch fields in the span routines.
Remove the SetBuffer driver function.
Consolidate the code for setting CTX_RB3D_COLOROFFSET and CTX_RB3D_COLORPITCH
state in new radeonUpdateDrawBuffer() function.
2005-09-01 03:54:34 +00:00
Brian Paul
8e5479c7f8 s/__inline/INLINE/ 2005-09-01 03:50:54 +00:00
Brian Paul
f1d269060b use char* instead of GLubyte* in i915_program_error() to silence warnings 2005-09-01 03:32:48 +00:00
Brian Paul
f069e74dd8 use proper datatypes to silence a bunch of warnings 2005-09-01 03:19:45 +00:00
Brian Paul
5545245fe7 added a few more fields to help with DRI drivers 2005-09-01 03:07:29 +00:00
Brian Paul
db84ec2c6d remove fxDDSetBuffer() 2005-09-01 03:06:28 +00:00
Brian Paul
af39910f94 remove set_buffer() 2005-09-01 03:05:39 +00:00
Brian Paul
c958a9798a remove old set_buffer routine and misc code 2005-09-01 03:04:41 +00:00
Brian Paul
26bb5239c8 remove the old set_buffer() routine 2005-09-01 02:56:47 +00:00
Brian Paul
527835977a Just additional comments. 2005-08-31 21:38:53 +00:00
Roland Scheidegger
36603539cc enable GL_ARB_texture_env_crossbar on r200, separate the enable bits for texture sampling and texture environment, optimize away texture sampling for units if the result is not used, always emit the env instructions in-order and try to eliminate GL_REPLACE env instructions. 2005-08-31 19:11:09 +00:00
Brian Paul
d5783737f1 use 'f' key to toggle front/back buffer rendering 2005-08-31 16:42:59 +00:00
Brian Paul
2c8524b4fb remove dead code, update comments 2005-08-31 16:04:17 +00:00
Alan Hourihane
cbafed8716 reverse a bogus patch 2005-08-31 15:11:21 +00:00
Dave Airlie
3d4d6d29e2 complete fix for miniglx startup issue since driver version checks 2005-08-31 01:24:01 +00:00
Brian Paul
275a563bea remove redundant ctx->Driver fallback assignments that were already done in _mesa_init_driver_functions() 2005-08-31 00:39:32 +00:00
Brian Paul
f830f640b6 fix a cast/assignment warning 2005-08-31 00:00:17 +00:00
Brian Paul
513a553d4a silence fprintf and casting warnings 2005-08-30 23:57:04 +00:00
Brian Paul
16fb04ccb5 added some parenthesis to silence warnings 2005-08-30 23:50:23 +00:00
Alan Hourihane
f98b9853e1 drmUnmap correct size 2005-08-30 20:37:30 +00:00
Alan Hourihane
b41c025420 move via_dri.h to server 2005-08-30 19:46:08 +00:00
Alan Hourihane
9165d46fdb define Bool for solo builds 2005-08-30 19:22:46 +00:00
Alan Hourihane
d5cc77e37c Fixes from https://bugs.freedesktop.org/attachment.cgi?id=3077 2005-08-30 19:14:23 +00:00
Brian Paul
156dc55628 fix APP_LIB_DEPS 2005-08-29 22:45:52 +00:00
Ian Romanick
f0d0e50994 Implement GL_ARB_texture_env_combine, GL_EXT_texture_env_combine, and
GL_ARB_texture_env_crossbar for i810.  This passes both demos/texenv and all
of glean's texCombine tests.
2005-08-29 15:43:02 +00:00
Alan Hourihane
d9089ab96e remove drmAddress 2005-08-29 15:23:55 +00:00
Brian Paul
3a165edc9a added note about IEEE vs VAX floating point (bug 4270) 2005-08-29 14:45:30 +00:00
Brian Paul
49fd874f24 fix a few proxy color table bugs (bug 4270) 2005-08-28 17:12:07 +00:00
Brian Paul
082501a74c check the Ready flag when getting GL_QUERY_RESULT_ARB 2005-08-27 14:04:37 +00:00
Brian Paul
23ffc3a85d Rearrange the code related to GL_ARB_occlusion_object to generalize query
objects for future types of queries.
2005-08-27 13:56:08 +00:00
Adam Jackson
ca1ac986a1 /dri/msg 2005-08-26 17:50:39 +00:00
Alan Hourihane
f4166a1fd7 Fix the scripts for the cygwin & mingw changes 2005-08-26 09:37:41 +00:00
Brian Paul
adbf932ec1 added singlebuffer demo 2005-08-25 23:26:51 +00:00
Brian Paul
59d680db22 Demo of how to do (nearly) flicker-free rendering with a single color buffer. 2005-08-25 23:25:25 +00:00
Brian Paul
713635adef fix comment and #if test 2005-08-25 22:09:43 +00:00
Brian Paul
a2c65f4793 don't compile debug code (bug 4242: rand undefined) 2005-08-25 19:43:38 +00:00
Brian Paul
2735b33638 remove stray references to ctx->Depth.OcclusionTest 2005-08-25 19:38:42 +00:00
Ian Romanick
8bc0b3f961 Fix texture format selection. ChooseTextureFormat is supposed to select the
hardware format of the texture, and SetTexImages is supposed to use the
format selected by ChooseTextureFormat.  However, both routines were making
their choices based on the texture's BaseFormat.  This is wrong.
ChooseTextureFormat uses BaseFormat and SetTexImages uses
TexFormat->MesaFormat.

Once SetTexImages was fixed to use the right format values,
ChooseTextureFormat was cleaned up.  It now uses the few available texture
formats supported by the i810 in a smarter way.  This should improve the
quality of LUMINANCE, LUMINANCE_ALPHA, and INTENSITY textures.

I tested this by cycling through all the texture formats in demos/texenv and
tests/yuvsquare.
2005-08-25 19:15:01 +00:00
Alan Hourihane
8de9d92acf update for mingw 2005-08-25 18:08:16 +00:00
Brian Paul
8e247d52e3 Update the glut idle function after a new window is created 2005-08-25 17:46:04 +00:00
Brian Paul
b8a804d24f initial 6.5 changes (reflect demo, remove GL_HP_occlusion_test) 2005-08-25 14:24:49 +00:00
Brian Paul
6e4f594a02 removed GL_HP_occlusion_test extension 2005-08-25 14:23:38 +00:00
Brian Paul
dd1a9f75dc fix segfault in Fake_glXCreatePBuffer(), bug 4235 2005-08-25 14:07:06 +00:00
Brian Paul
7e6553c1aa s/GLX_RGBA_BIT/GLX_RGBA_TYPE/ (bug 4237) 2005-08-25 13:18:53 +00:00
Eric Anholt
61d386a93f Attempt to fix the issue reported by Alan Grimes with DRM_RADEON_TEXTURE
erroring out when it shouldn't.  The errno could be changed by usleep() between
the ioctl call and the loop check, if a signal was received.  This could cause
an EAGAIN return from the DRM_RADEON_TEXTURE ioctl to not loop again.
Instead of checking errno, check thevalue of ret itself, since it is a saved
(and sign-flipped) copy of errno from the ioctl call.
2005-08-25 03:38:07 +00:00
Brian Paul
d545d916a8 make tiles a little smaller so they're all visible 2005-08-25 03:09:12 +00:00
Brian Paul
9e385282fc also check for texture border in sample_linear_2d() 2005-08-25 03:05:10 +00:00
Brian Paul
5d7c486d90 Added multi-window support. Press 'n' to create new window, 'k' to kill
a window.  Good for exercising multi-window rendering.
2005-08-24 21:32:02 +00:00
Alan Hourihane
c58cea0085 Fix Windows build problems.
GCC's visibility attribute is for ELF systems, so undef INTERNAL
GCC's fastcall attribute interferes with __stdcall so undef FASTCALL
2005-08-24 09:08:06 +00:00
Brian Paul
334f2d8077 GLw demo doesn't belong here 2005-08-23 14:50:02 +00:00
Brian Paul
17756df903 removed lines that caused some files to be included in tarballs multiple times 2005-08-23 13:40:30 +00:00
Brian Paul
edf0d14bd4 simplify, clean-up texel addressing macros 2005-08-23 03:50:12 +00:00
Brian Paul
249160fdfa update version to 6.5.0 2005-08-23 00:45:54 +00:00
Brian Paul
dfb6c56ed8 added GL_X_RENDERABLE to glXChooseFBConfig (bug 4181) 2005-08-22 14:28:19 +00:00
Brian Paul
dcf14aa3a7 bump version to 6.5 2005-08-22 14:27:33 +00:00
Brian Paul
1e71d6af48 added .S DRI files to tarball (Donnie Berkholz), bumped version to 6.5 2005-08-22 14:27:13 +00:00
Dave Airlie
298af7a609 fix up libdrm for egl 2005-08-21 03:17:52 +00:00
Brian Paul
ae27ef2219 fix typo 2005-08-19 23:44:35 +00:00
Brian Paul
f350e22716 md5 sums for 6.3.2 2005-08-19 23:42:29 +00:00
Brian Paul
eacd347fce update MESA_DEBUG with FP info 2005-08-19 23:34:10 +00:00
Adam Jackson
8fcd1e0287 Convert libGL and DRI drivers to require libdrm.
libdrm can be had from:

http://people.freedesktop.org/~ajax/libdrm/
2005-08-19 20:20:03 +00:00
Ian Romanick
2ae5645115 Fix a realloc problem with indirect vertex arrays. The actual head pointer
wasn't tracked and used for the realloc, so it tended to explode.
2005-08-19 18:53:26 +00:00
Brian Paul
b7c727e500 updates for 6.3.2 release, plus other assorted clean-ups 2005-08-19 16:57:50 +00:00
Alan Hourihane
d912f6cfe3 Commit missing piece from Egbert's 32/64 bit patches 2005-08-19 16:07:33 +00:00
Ian Romanick
f7eb54a12f Enable ARB_texture_compression. The code has been in place for a long time,
but, for whatever reason, the extension wasn't enabled.

Add some comments to i810ChooseTextureFormat.  There's some strangeness with
i810 texture formats.
2005-08-19 00:48:25 +00:00
Ian Romanick
e0029b33ef Add support for NV_blend_square. This was tested with
progs/tests/blendsquare.
2005-08-18 22:27:37 +00:00
Ian Romanick
ab5be2c5f7 Make sure extension entry point offsets are properly initialized. This is
primarilly needed to support functions that are internally implemented using
extension entry points (e.g., glBlendFunc uses glBlendFuncSeparate).
2005-08-18 22:16:46 +00:00
Ian Romanick
61ac29e7c6 Don't try to update hardware texture fields if there is no hardware texture.
This can happen when all the texture enables for a texture unit are disabled.

This fixes bugzilla #3195.
2005-08-18 20:01:01 +00:00
Ian Romanick
b462855c24 Add simple regression test for bugzilla #3195. 2005-08-18 19:52:44 +00:00
Ian Romanick
e918bac8cd Make the i810 driver use driGetRendererString like all the other drivers.
The GL_RENDERER string now accurately contains the chip name.  This was only
tested on a "plain" i810 (PCI ID 8086:7121).
2005-08-18 19:51:11 +00:00
Brian Paul
aa2a357bae Replace mult/div operators with bitwise operators in texel fetch routines
for better performance. (Roland Scheidegger)
2005-08-18 14:33:26 +00:00
Brian Paul
05fe2871e3 Bump version to 6.3.2 2005-08-16 23:13:25 +00:00
Brian Paul
926a19e108 updates for 6.3.2 2005-08-16 23:12:37 +00:00
Brian Paul
160b3284dd include stdint.h if WIN32 and GNUC (Colin Harrison). Patch forwarded to SGI. 2005-08-15 23:25:33 +00:00
Brian Paul
c2c2600728 test the standard stencil op modes too (Philipp Klaus Krause) 2005-08-15 22:57:30 +00:00
Roland Scheidegger
7a362deb8c In _mesa_TexEnvfv, do not accept values for GL_OPERAND2_ALPHA and GL_OPERAND2_RGB which are only valid with ARB_texture_env_combine but not with EXT_texture_env_combine, when only EXT_texture_env_combine is supported. 2005-08-15 18:24:12 +00:00
Ian Romanick
a3dd6efb00 Put back '-I/usr/X11R6/include'.
Make 'USING_EGL=0' the default for now.  It's causing too much confusion for
too many non-developers (which in turn wastes too much developer time).  It
is trivially overridden from the make command line.  See comments in
linux-dri.
2005-08-15 15:01:39 +00:00
Alan Hourihane
dabec11d27 Add Egberts fixes for 64bit architectures
Add additional checks for the *DRIRec info structure passed in from the
device driver. This ensures that things fallback to indirect rendering if
the DDX driver has had modifications (i.e. removal of the drmAddress field).
2005-08-15 06:59:24 +00:00
Alan Hourihane
69dc32cfac Add a check which compares the passed in size of the DDX driver private DRI
structure to the 3D drivers view of it, and abort if they don't match.

This traps the case with the drmAddress removal in the DDX driver.
2005-08-14 12:16:51 +00:00
Ian Romanick
33f9c98aa6 Enable support for EXT_stencil_wrap. The code was already there, but the
extension wasn't enabled.  I have verified its correct function with Mesa's
stencil_wrap test.  It is enabled on both Savage4 and Savage3D.  Since
Savage3D uses a software fallback for *all* stencil operations, this is safe.
2005-08-13 01:43:28 +00:00
Brian Paul
6fe7a0dc01 added FREXPF() macro (bug 4060) 2005-08-12 18:56:56 +00:00
Ian Romanick
f2876d1ee3 Remove the logic that determines at compile time whether or not HAVE_ALIAS
should be defined.  It was flawed on some platforms (e.g., Darwin & mingw).
Instead, rely on the build system to define it on the compiler command line.

This also reverts ajax's hand-edit to indirect_size.c.  I'll fix that on the
X.org side of things later today.
2005-08-11 20:29:45 +00:00
Ian Romanick
fbcc5aedf2 Remove support for the R200_NO_VTXFMT environment variable. Instead use
'tcl_mode=1'.  This fixes bugzilla #3972.
2005-08-11 19:47:06 +00:00
Ian Romanick
4c4e4bfa4e Makefile cleanups suggested by George Fufutos (bugzilla #3899). 2005-08-11 19:37:55 +00:00
Ian Romanick
ac7c147aaf Don't link with libGL, libEGL, or libEGLdri. On EGL setups libGL isn't
available, and on libGL setups libEGL and libEGLdri aren't available.
2005-08-11 19:29:25 +00:00
Ian Romanick
b7ae3e4787 Since Brian's recent commit, "-I/usr/X11R6/include/X11/extensions" is no
longer needed.
2005-08-11 19:23:23 +00:00
Brian Paul
82dfd4b71f fix X #includes so they're relative to X11/ directory (bug 4047) 2005-08-11 14:18:53 +00:00
Ian Romanick
ac887d4211 Make ffb driver build on x86-64. The fix is two fold. First, use the
proper DRM_CAS_RESULT to declare the variable used to store the result
of DRM_CAS.  Second, only use the "real" versions of LOCK_HARDWARE and
UNLOCK_HARDWARE on SPARC.  That's the only platform where the hardware
can really exist.
2005-08-11 04:25:36 +00:00
Ian Romanick
967b006f51 Remove _glapi_check_multithread from the interface exported by the loader to
the driver.  The loader now takes care of this for the driver.

Remove _glapi_DispatchTSD and give _glapi_Dispatch its semantic (i.e.,
having a NULL value means that the application is multithreaded and
_glapi_get_dispatch must be called).

Gut all of the dispatch override code.  This removes _glapi_RealDispatch,
_glapi_tls_RealDispatch, _glapi_begin_dispatch_override,
_glapi_end_dispatch_override, and _glapi_get_override_dispatch.

Remove _glapi_get_proc_address, _glapi_get_proc_name, _glapi_get_version,
and _glapi_check_table from the loader / driver interface.

Reviewed by: Brian Paul
2005-08-10 23:54:15 +00:00
Ian Romanick
1b8d0f149e Mesa uses the glVertexAttrib*NV functions to implement fixed-function
attributes in display lists.  If a driver doesn't add entry points for
GL_NV_vertex_program, it will explode.  This patch adds GL_NV_vertex_program
to the list of default extensions whose entry points are added by
driInitExtensions.

Thanks go to Roland Scheidegger for tracking the problem down and suggesting
the fix.
2005-08-10 23:39:42 +00:00
Brian Paul
8c9cd63c89 the PIXEL_MAP_I_TO_I table should be GLfloat, not GLint 2005-08-10 17:04:03 +00:00
Brian Paul
63c9ebeaff fix static assertion problem for gcc (bug 4022) 2005-08-10 14:42:21 +00:00
Brian Paul
6b563bda43 disable the pointer size assertions (bug 4021) 2005-08-10 14:40:05 +00:00
Brian Paul
5d40169436 fix indentation 2005-08-10 14:38:39 +00:00
Keith Whitwell
738c9a073f Check for prim/vertex store non-null before messing with refcounts. 2005-08-10 14:13:45 +00:00
Ian Romanick
258f005c6b Add rules and target to build src/mesa/x86-64/glapi_x86-64.S. 2005-08-09 18:54:12 +00:00
Keith Whitwell
c91720fb1a Decrement the context's refcounts on part-used storage structs on
context destroy.  Fixes memory leak.
2005-08-09 16:11:28 +00:00
Brian Paul
d2e289c70f actually free the renderbuffer in xmesa_delete_renderbuffer(), fixes a memory leak 2005-08-09 15:17:19 +00:00
Brian Paul
e78a3c42e4 delete display lists upon exit 2005-08-09 15:14:51 +00:00
Brian Paul
a1a6fa2fa1 free display lists and destroy window upon exit 2005-08-09 15:13:32 +00:00
Brian Paul
ecde87054c _mesa_free_framebuffer_data() call frees the renderbuffers, no need to call the Delete methods after 2005-08-09 15:07:55 +00:00
Brian Paul
24d55a1145 free context structure (bug 1252316) and s/free/_mesa_free/ 2005-08-09 14:23:28 +00:00
Ian Romanick
aba4864a25 Make the linux-dri-x86 builds work on x86-64 again. mklib now
determines the bits (either 32 or 64) for libraries without the lib
prefix.  progs/egl/Makefile passes CFLAGS on the link commands so that
things like '-m32' get propagated.
2005-08-08 23:22:46 +00:00
Brian Paul
7bf08c23fd s/Disaptch/Dispatch/ (bug 3918) 2005-08-08 21:42:51 +00:00
Brian Paul
63dffa4e77 added directfbgl.h to tarball 2005-08-08 21:30:12 +00:00
Ian Romanick
da0c5b2e2c Since glcontextmodes.[ch] are no longer used in the DRI drivers, removed the
IN_DRI_DRIVER cruft.  This was suggested by George Fufutos.
2005-08-08 17:22:44 +00:00
Dave Airlie
0d942b740c fix up color tiling in miniglx radeon server code 2005-08-08 04:34:35 +00:00
Dave Airlie
ac54de021a fix miniglx setting virtual size of 832 for 800x600 2005-08-08 04:17:52 +00:00
Jon Smirl
ae4e58c9ab Remove platform specific bits from radeon_egl.c 2005-08-08 03:58:26 +00:00
Eric Anholt
81b3c5e85c Dike out the linux-specific EGL bits unless it's a linux build. 2005-08-08 03:27:28 +00:00
Eric Anholt
f1a261377f Since this isn't a bash script, don't use function and instead inline the usage
into the one place that it's used.
2005-08-08 03:26:18 +00:00
Vladimir Dergachev
8e653f12bc Allow R300 driver to build on x86-64 and PowerPC. 2005-08-07 21:50:33 +00:00
Jon Smirl
bf54a28384 Add missing egldri.h header file 2005-08-07 02:30:32 +00:00
Jon Smirl
9a4dbf1cff Fix up some of the sample to work with the r200 EGL driver 2005-08-07 02:15:27 +00:00
Jon Smirl
7e5da5d526 Enable EGL support in 'linux-dri' config 2005-08-07 02:13:14 +00:00
Vladimir Dergachev
94a4eb1e78 Follow suggestion by Aapo Tahkola to fix giant memory leak from forgetting to free the key when entry was already found (presumably a common case). 2005-08-06 05:19:42 +00:00
Vladimir Dergachev
b8731903df Fix card_extensions by following corresponding r200 code.
Fix suggested by Ian Romanick.
R300 driver now works without segfault.
2005-08-06 04:39:27 +00:00
Ian Romanick
23a4f50c5b Fixes bugzilla #1730.
Make sure that all the values used in the clean-up code are initialized at
some point.  It is still unclear to me as to why GCC does not complain.  I
suspect the problem may be due to the depth of if-statement nesting.
2005-08-05 23:13:13 +00:00
Ian Romanick
6965f2cb0a Fixes bugzillla #812.
The weak version of _glapi_DispatchTSD was removed from dri_util.c.  As
stated in the bug report, this was only needed to support versions of libGL
that did not have this symbol.  Versions of libGL without this symbol are no
longer supported at all, so it is totally irrelevant.
2005-08-05 22:12:49 +00:00
Alan Hourihane
928218a283 remove the drmAddress 2005-08-05 20:47:59 +00:00
Ian Romanick
6bc24c5c05 In order to create the set of available extensions, we have to know if
direct-rendering is possible on a given screen.  It is not possible to
determine this by just looking at driDisplay.private in the display
structure.  However, it is possible to determine this by looking at
driScreen.private in the screen structure.  This field is only non-NULL if a
DRI driver has been successfully loaded and bootstrapped.  Once we get to
that point, we know that direct-rendering is at least theoretically
possible.

This fixes bugzilla #2875.
2005-08-05 19:13:51 +00:00
Ian Romanick
126c89e35f Fix recent problems with display lists and other parts of the code.
CALL_by_offset, SET_by_offset, and GET_by_offset all had various problems.

The core issue is that parts of the device-independent code in Mesa assumes
that all functions have slots in the dispatch table.  This is especially
true in the display list code.  It will merrilly try to set dispatch
pointers for glVertexAttrib1fARB even if GL_ARB_vertex_program is not
supported.  When the GET/SET/CALL macros are invoked, they would read a 0
from the remap table.  The problem is that 0 is the dispatch offset for
glNewList!

One change is that the remap table is now initialized to be full of -1
values.  In addtion, all of the *_by_offset marcos misbehave in an obvious
way if the specified offset is -1.  SET_by_offset will do nothing,
GET_by_offset will return NULL, and CALL_by_offset, since it uses
GET_by_offset, will segfault.

I also had to add GL_EXT_blend_func_separate to the list of default
extensions in all_mesa_extensions (src/mesa/drivers/dri/common/utils.c).
Even though many drivers do not export this extension, glBlendFunc is
internally implemented by calling glBlendFuncSeparate.  Without this
addition, glBlendFunc stopped working on drivers (such as mga) that do not
export GL_EXT_blend_func_separate.

There are still a few assertions / crashes in GL_ARB_vertex_program tests,
but I don't think that these are related to any of my changes.
2005-08-05 18:13:37 +00:00
Jon Smirl
33f5e47faf Remove EGL from linux-solo makefile 2005-08-05 03:48:15 +00:00
Jon Smirl
485528f2ac More EGL prep. No impact on anything outside of EGL 2005-08-05 03:33:59 +00:00
Jon Smirl
b507bd4160 New files for radeon egl driver.
Still a work in progress.
2005-08-04 22:23:34 +00:00
Ian Romanick
711555d1e3 Convert all instances of XTHREADS to USE_XTHREADS. This fixes one of
serveral things that are broken when building on a system with X.org 7.0rc0
installed.
2005-08-03 23:05:25 +00:00
Dave Airlie
7f5925d57c Add color tiling support to miniglx for radeon
(Stephane Marchesin + Dave Airlie)
2005-08-03 10:22:31 +00:00
Ian Romanick
7adcedcd54 Fix build problems related to finding Xthreads.h. 2005-08-01 16:30:24 +00:00
Ian Romanick
29206ae569 Remove unused structures and data fields. These had been left in because
DRI drivers using the "old" interface relied on certain fields being at
certain offsets.  Removing the structures would break that.  Now that the
old interface is no longer supported, the dead data can finally die.
2005-07-29 17:30:18 +00:00
Ian Romanick
dc6e2c778a Add a new config called linux-indirect. This build the GLX libGL just like
linux-dri, but it disables support for direct-rendering in it.  This config
mainly exists so that I can verify that changes to libGL haven't broken
builds on non-DRI platforms.
2005-07-29 17:25:50 +00:00
Jon Smirl
4508bcc72c Leave the AGP_BASE code in. It is pointless to bump the interface
for X on a miniglx fix. It can be removed later.
2005-07-29 16:53:02 +00:00
Jon Smirl
a7d4bfed8a Remove OUTREG(RADEON_AGP_BASE, info->ringHandle); from DRI driver
Code is already in DRM driver to do this.
2005-07-29 13:58:22 +00:00
Jon Smirl
4ce390b933 Commit Ian's fixes from Bug 3877
I have tested these on miniglx and they seem to be working.
I'm sure Dave will give them a better test.
2005-07-29 00:48:12 +00:00
Jon Smirl
df68d11b47 Fix a == vs !- typo for glx_enable_extension 2005-07-29 00:19:36 +00:00
Ian Romanick
82e3ecf413 Use the routines supplied in the __DRIinterfaceMethods structure to create a
destroy __GLcontextModes structures.  This eliminates the need for DRI
drivers to ever link with glcontextmodes.c.
2005-07-28 23:33:18 +00:00
Ian Romanick
f7c9eafa85 glxEnableExtension is a platform-specific function exported by the loader.
Therefore, drivers should not require it to run.
2005-07-28 21:57:17 +00:00
Ian Romanick
68679d2b9e Remove '#if 0' block that was accidentally left in. 2005-07-28 20:55:26 +00:00
Brian Paul
960467443e SPARC, DRI interface changes for 6.3.1 2005-07-28 02:46:26 +00:00
Ian Romanick
14fa5f6a60 The dri/*/depend files don't exist on a raw check-out, and that makes 'make
tarballs' have issues.
2005-07-28 01:15:45 +00:00
Ian Romanick
1585c234e0 Major rip-up of internal function insertion interface. The old
_glapi_add_entrypoint has been replaced by a new routine called
_glapi_add_dispatch.  This new routine dynamically assignes dispatch offsets
to functions added.  This allows IHVs to add support for extension functions
that do not have assigned dispatch offsets.

It also means that a driver has no idea what offset will be assigned to a
function.  The vast majority of the changes in this commit account for that.
An additional table, driDispatchRemapTable, is added.  Functions not in the
Linux OpenGL ABI (i.e., anything not in GL 1.2 + ARB_multitexture) has a
fixed offset in this new table.  The entry in this table specifies the
offset in of the function in the real dispatch table.

The internal interface was also bumped from version 20050725 to 20050727.

This has been tested with various programs in progs/demos on:

radeon (Radeon Mobility M6)
r128 (Rage 128 Pro)
mga (G400)
2005-07-28 00:29:51 +00:00
Ian Romanick
9f23a3a1bf Fix SPARC assembly for 64-bit
- The test for whether or not we're building for 64-bit is '#ifdef __arch64__'.
 This appears to be correct on both Linux and Solaris.

- The test for Solaris is now '#if defined(SVR4) || defined(__SVR4) ||
defined(__svr4__)'.  GCC 3.4.0 has all three defined on Solaris 9.

- Enables assembly language clip routines.

- Fixes to make GLSL code build on Solaris.

- Update gl_SPARC_asm.py.
2005-07-28 00:11:10 +00:00
Philippe Houdoin
3e36986e5a This precious BeOS include file was lost since some released MesaLibs. Fixed. ;-) 2005-07-27 19:56:33 +00:00
Roland Scheidegger
67d94e5a86 test for the proper drm version, at least 1.17 is required 2005-07-27 18:21:34 +00:00
Alan Hourihane
a7df74ea02 typo 2005-07-26 23:09:50 +00:00
Alan Hourihane
36d6e9df16 support GLX_DIRECT_COLOR in 1.4.0 2005-07-26 23:06:10 +00:00
Ian Romanick
ab7c6ffadc Remove the last remnants of GLX_BUILT_IN_XMESA. This allows the removal of
the evil, ugly GLX_PREFIX macro as well.
2005-07-26 22:53:38 +00:00
Alan Hourihane
1361398600 Bump the required ddx to 1.4.0 as drmAddress has been removed so that 32/64bit
combinations work.
2005-07-26 21:53:16 +00:00
Ian Romanick
5c6fd3dd4c No, really, get rid of all the remaining references to DRI_USE_NEW_INTERFACE.
A couple other remnants of the old interfaces hit the dust too.  Thanks
Jon. :)
2005-07-26 05:57:24 +00:00
Ian Romanick
a08d8a095c Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' will
work again.
2005-07-26 05:55:56 +00:00
Ian Romanick
5f1ba3e21b Fixes the glXGetProcAddress portion of the interface. Most of the functions
that are currently obtained via glXGetProcAddress and all of the XF86DRI
functions are replaced with a funciton table.  This table will be passed to
__driCreateNewScreen.

One of the functions in the table is getProcAddress.  This allows some
loaders to expose functionality not in all loaders.  This will be immediatly
used for glxEnableExtension (formerly known to drivers as
__glXScrEnableExtension).  libGL (and in the future libglx) expose this
function so that drivers can enable GLX extensions.  libEGL should exposed
eglEnableExtension to enable EGL extensions.  The same function cannot be
used for both because the extensions have different names and (possibly)
different semantics.  Drivers can optionally use one, both, or neither.

The key parts are in the __DRIinterfaceMethodsRec structure in
dri_interface.h.  A pointer to one of these structures is passed into
__driCreateNewScreen.  Because of this, the version of the API is bumped to
20050725.  Since the previous version(s) were never in a release, their
existance is erased.

I was actually a little surprised by how much code this cuts from the
drivers.  A lot of glXGetProcAddress calls disappear, and a lot of
version checks go with them.  Nice.

The one thing I'm not sure of is removing __glXInitialize.  For some
reason that function was in the glXGetProcAddress table, but *nothing*
in the Mesa tree used it.  Did something with DRI conf. use this
function?  It seems odd...
2005-07-26 02:44:01 +00:00
Brian Paul
1201348a33 improve comments about win[0..3] values (bug 2554) 2005-07-26 01:04:53 +00:00
Brian Paul
800c72ae61 Fix bug 1858 - array subscript out of range in gamma driver.
Set ctx->Const.MaxTextureLevels = GAMMA_TEX_MAXLEVELS = 12
Remove bogus WRITE(level 12).
Max gamma texture size is 2kx2k  (note: 2k = 1 << (MaxLevels - 1))
2005-07-26 00:10:53 +00:00
Brian Paul
7c1ab40898 Add license/copyright.
Add -h/--help option for usage.
Minor clean-ups.
2005-07-25 23:49:50 +00:00
Brian Paul
8dcc6736ab Added -linker option to mklib, used to specify a particular program for
linking, if relevant.
Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
2005-07-25 22:59:58 +00:00
Ian Romanick
e9dbe58b8b Gut a few more dead bits. Replace uses of the CreateNewScreenFunc typedef
(from glxclient.h) with PFNCREATENEWSCREEN (from dri_interface.h).

Remove the prototype for __driCreateScreen and fix the prototype for
__driCreateNewScreen (append the API version) in dri_interface.h.
2005-07-24 07:38:23 +00:00
Ian Romanick
c39bf5e273 All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allows
1,402 lines of code to be removed from Mesa (drivers and libGL).  The
big winner is dri_util.c.

Primary changes are:

1. Remove all "deprecated" entry-points from the various structures in
dri_interface.h.

2. Rename the remaining fields to removed "version numbers."  So,
bindContext3 becomes bindContext.  Functions with "New" in the name
(e.g., CreateNewContext) were *not* changed, but that is an option.
Having "New" in the name is less annoying to me than having "3" in the name.

3. Remove all compatibility code that handles cases where the driver or
the loader is too old to support the latest interfaces.

4. Append the API version to the __driCreateNewScreen function name.
This is currently done by hand.  In the future (i.e., the next time we
make an incompatible change to the interface) we'll want to come up with
a better way to do this.  This prevents old loaders from being able to load
new (incompatible) drivers.

5. Bump the API version to 20050722.  All drivers (by way of dri_util.c)
require this version.

6. All drivers are *required* to expose GLX_SGIX_fbconfig and
GLX_OML_swap_method (or the moral equivalents).  Support for these
functions in implicit in the use of the "new" interface.

7. Some cases still exist that need to be compiled differently in a loader
or core Mesa versus in a driver.  These are identified by the define
IN_DRI_DRIVER.
2005-07-24 06:29:14 +00:00
Adam Jackson
7d40d230fa Add two aliases for some PointParameters entrypoints for libglx compatibility.
Doing this here rather than on the GLX side since the X monolith hasn't had
Mesa 6.3 imported yet.

idr, I know this is touching a generated file, but I haven't figured out what
needs changing in the generator scripts to make this change happen.  If you
could add that I'd appreciate it.
2005-07-23 02:09:58 +00:00
Brian Paul
3e2419a7cc Break the long list of MAIN_FILES and DEMO_FILES into subgroups.
rm/touch the depend files when making tarballs so they don't include
RedHat-specific paths (bug 3842).
2005-07-22 15:52:46 +00:00
Jouk Jansen
70cf1f0cf8 ----------------------------------------------------------------------
Committing in .

 _mesa_sprintf crashes on OpenVMS -> replaced it by the OS-supplied sprintf

 Modified Files:
 	Mesa/src/mesa/drivers/x11/fakeglx.c
 ----------------------------------------------------------------------
2005-07-22 09:30:54 +00:00
Brian Paul
60a6a0eb51 some GLuint idx -> GLint idx changes 2005-07-22 02:55:36 +00:00
Brian Paul
fea5a428e9 added vp negative addressing bug fix 2005-07-22 02:54:14 +00:00
Brian Paul
61e694f270 Make the vertex program source register Index field a signed int since
relative addressing can be negative.
Change some GLuint indexes to GLint in the t_vp_build.c file.
Added PROGRAM_UNDEFINED token for initializing the register File field to
avoid a gcc 4.0 warning.
2005-07-22 02:53:38 +00:00
Brian Paul
db251d72c8 bump version to 6.3.1 2005-07-21 18:46:49 +00:00
Brian Paul
7a37189adc 6.3.1 updates 2005-07-21 18:45:54 +00:00
Brian Paul
f87bb14b0b updated with DRI building instructions 2005-07-21 18:45:44 +00:00
Brian Paul
dff11bb9a8 bump version to 6.3.1 and include DRI/GLX files in tarballs 2005-07-21 18:44:52 +00:00
Brian Paul
98b06bcbeb make i810PrintSetupFlags() static, first param const 2005-07-21 18:11:24 +00:00
Brian Paul
7b5c506c0e first 6.3.1 bug fixes 2005-07-21 15:58:16 +00:00
Brian Paul
7cf480e6fe s/2004/2005/ 2005-07-21 15:57:29 +00:00
Brian Paul
951dbf08e7 check for FEATURE_EXT_framebuffer_object to enable EXT_framebuffer_object 2005-07-21 15:48:39 +00:00
Brian Paul
49e74989c3 remove ^M chars, disable shading language extensions 2005-07-21 15:41:56 +00:00
Eric Anholt
3e8efc3753 Clean up warnings in r300 code by making some symbols static, adding prototypes
for others, and being cleaner with types in fragment/vertex program structures.
One warning in r300_shader.c is still concerning.
2005-07-20 23:24:55 +00:00
Eric Anholt
aeb0ee771b Connect the r300 bits up to the build. 2005-07-20 22:08:06 +00:00
Eric Anholt
6ae76788a7 Add some missing defines, copied from linux-dri. 2005-07-20 22:07:29 +00:00
Eric Anholt
e98494d0a4 Forced commit to note repocopy from r300.sf.net CVS. 2005-07-20 21:35:27 +00:00
Brian Paul
18014525a1 fix some URLs 2005-07-20 18:25:01 +00:00
Brian Paul
2276679c53 added md5 checksums for 6.3 2005-07-20 18:20:45 +00:00
Brian Paul
d4596584f6 more updates for 6.3 release 2005-07-20 18:07:11 +00:00
Brian Paul
6bb49eacfd updates for 6.3 release 2005-07-19 21:01:46 +00:00
Brian Paul
bfb5ea307e replace fprintf() calls with _mesa_problem() 2005-07-19 18:20:04 +00:00
Brian Paul
364ae78e69 remove fprintf() 2005-07-19 18:18:49 +00:00
Brian Paul
8d7d9c22f6 include driverfuncs.h 2005-07-19 15:34:44 +00:00
Brian Paul
2d47c07398 overlay planes test 2005-07-19 15:27:03 +00:00
Brian Paul
7e152b83cb s/clippping/clipping/ 2005-07-18 20:07:19 +00:00
Philippe Houdoin
ed886336e1 Fixed warnings by using GLUTProc type instead of anonymous (void *) for
GLUT callbacks.
2005-07-18 19:27:49 +00:00
Alan Hourihane
5343ae8304 re-enable the ffb driver 2005-07-18 13:53:03 +00:00
Alan Hourihane
df88dfe1df Fix the FFB driver for the renderbuffer changes
Support NEW INTERFACE as well
2005-07-18 13:52:34 +00:00
Alan Hourihane
c235a96a71 pass in the renderbuffer 2005-07-18 13:50:06 +00:00
Ian Romanick
aa8ff1e75d Missed this on the previous commit. 2005-07-18 12:33:03 +00:00
Ian Romanick
9bdfee3a47 Wrap every place that accesses a dispatch table with a macro. A new script-
generated file, called src/mesa/glapi/dispatch.h, is added.  This file
contains three macros for each API function.  It contains a GET, a SET, and
a CALL.  Each of the macros take a pointer to the context and a pointer to
the dispatch table.

In several threads on mesa3d-dev we discussed replacing _glapi_add_entrypoint
with a new function called _glapi_add_dispatch.  For this discussion, the
important difference between the two is that the caller of _glapi_add_dispatch
does *not* know what the dispatch offset will be at compile time.  Because of
this callers need to track the dispatch offset returned by
_glapi_add_dispatch.

http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2

The downside is that driver code then has to access the dispatch table two
different ways.  It accesses it using structure tags (e.g., exec->Begin) for
functions with fixed offsets and via a remap table (e.g., exec[
remap->NewExtensionFunction ]) for functions without fixed offsets. Yuck!

Using the macros allows both types of functions to be accessed
identically.  If a driver needs to set a pointer for Begin, it does
'SET_Begin(ctx, exec, my_begin_function)'.  If it needs to set a pointer
for NewExtensionFunction, it does 'SET_NewExtensionFunction(ctx, exec,
my_NewExtensionFunction_function)'.  Furthermore, if at some point in
the future a static offset is assigned for NewExtensionFunction, only
the macros need to change (instead of every single place that accesses a
table for that function).

This code differs slightly from the originally posted patches in that the
CALL, GET, and SET marcos no longer take a context pointer as a parameter.
Brian Paul had suggested that the remap table could be stored as a global
since it would be set at CreateScreen time and would be constant for all
contexts.  This change reflects that feedback.

http://marc.theaimsgroup.com/?t=112087194700001&r=1&w=2
2005-07-18 12:31:24 +00:00
Adam Jackson
e0e993c5ff XMesaResizeBuffers needs separate paths for client and server builds 2005-07-16 04:02:05 +00:00
Adam Jackson
c529f6bf70 strip out vestigial #ifdef HAVE_CONFIG_H stanzas, they're confusing the
modular X build
2005-07-16 00:56:20 +00:00
Brian Paul
8d3aca655e disable call to via_sse_memcpy() until it's fixed 2005-07-15 23:13:46 +00:00
Brian Paul
1f88391747 need to flush vertices for GL_OCCLUSION_TEST_RESULT_HP query 2005-07-15 23:08:06 +00:00
Brian Paul
d39760d718 Check for null program->Parameters pointer in validate_vertex_program().
GL_NV_vertex_program programs can't directly reference GL state so this
pointer is always NULL.
2005-07-15 22:48:09 +00:00
Brian Paul
df0350b7ec added comments 2005-07-15 22:47:00 +00:00
Brian Paul
b0489d4f82 remove duplicate "User disable" string 2005-07-15 20:17:02 +00:00
Brian Paul
8ec981c469 redo previous check-in, just set ARCH_FLAGS = -m32 2005-07-15 14:31:31 +00:00
Brian Paul
4eb3a0f076 define CFLAGS and CXXflags with -m32 (Egbert Eich) 2005-07-15 13:58:58 +00:00
Brian Paul
4c72778251 replace gcc with $(CC) (Egbert Eich) 2005-07-15 13:55:20 +00:00
Brian Paul
badad72383 eglgears demo (Dane Rushton) 2005-07-14 23:16:41 +00:00
Brian Paul
c62c24c72f added a few more fallbackStrings (Andreas Stenglein) 2005-07-14 23:10:21 +00:00
Keith Whitwell
b127cfeb7a Use the LDEXPF wrapper macro. 2005-07-13 17:49:22 +00:00
Keith Whitwell
3f7cb794ea Add a LDEXPF wrapper macro. 2005-07-13 17:47:40 +00:00
Keith Whitwell
c472dcdac0 Wrap RESTORE_FPU/RND_NEG_FPU declarations with check for USE_SSE_ASM. 2005-07-13 13:50:31 +00:00
Keith Whitwell
ce721143b4 Cache texenv programs to avoid repeated compilation (Ben Skeggs) 2005-07-11 10:10:38 +00:00
Keith Whitwell
9311bc253e Add runtime compiled x87 implementations for most of the remaining
opcodes.  When enabled via environment vars, gears runs and almost
looks right but other apps are still quite buggy.
2005-07-10 11:23:10 +00:00
Keith Whitwell
0cfbd849ec Add lots of x87 fpu instructions. 2005-07-10 11:14:00 +00:00
Ian Romanick
6d5d1f8a41 Restore linux-x86-32 config for Brian. 2005-07-08 21:55:56 +00:00
Ian Romanick
38e2fa385d Put back the glPopMatrix. This test was derived from blendminmax.c.
When extra code was cut from blendminmax.c's Display function, the
glPopMatrix call was also accidentally cut.
2005-07-07 20:43:01 +00:00
Ian Romanick
2550844c6e Correct the comments in the file headers. Oops. 2005-07-07 19:35:30 +00:00
Ian Romanick
259f096ed8 Add regression test for bug #3101. 2005-07-07 19:34:06 +00:00
Roland Scheidegger
f3186e5789 Re-enable r200InitSpanFuncs, which was ifdefed out (probably by mistake?),
so r200SetBuffer, r200SpanRenderStart and r200SpanRenderFinish get called again.
Bugzilla #3705, #3706.
2005-07-06 12:49:46 +00:00
Brian Paul
4cf6718725 The old MESA_PBUFFER_ALLOC() function allocated memory on 512-byte boundaries.
Restore that behavior with new _mesa_alloc_texmemory() function.
Should fix via_sse_memcpy() problem in found with flightgear.
2005-07-05 14:13:42 +00:00
Jon Smirl
78be0b5dad Put default back to the normal DRM path 2005-07-02 21:28:01 +00:00
Ian Romanick
f0ff50d4ed Add support for assembly (static) dispatch functions on x86-64. This
is basically patch #2939 from X.org bugzilla #3379.  This does *not*
fix the bug as it does not dynamically generate stubs at run-time.  It
just gets things one step closer.
2005-07-02 08:29:57 +00:00
Ian Romanick
1a9cac10b8 linux-x86-32 is unnecessary. The same thing can be acomplished by
'make linux-x86 ARCH_FLAGS=-m32'.
2005-07-02 07:48:41 +00:00
Ian Romanick
9204e87b2e Massive refactor of (most of) the Linux config files. This reduces
the length of each config and brings a lot of much needed uniformity
to them.
2005-07-02 07:38:40 +00:00
Ian Romanick
4f178c6e3a Add $(CFLAGS) to the link commands. This makes 'make linux-x86
ARCH_FLAGS=-m32' work correctly on x86-64 systems.
2005-07-02 07:12:44 +00:00
Ian Romanick
ef2ce9d003 Make linux-x86 more like the other linux configs. 2005-07-02 07:11:54 +00:00
Vladimir Dergachev
c1c684b0f3 Expose the fact that we do not do either selection of feedback buffers - either with software or hardware rendering. 2005-07-02 01:09:10 +00:00
Jerome Glisse
666dcaaf05 Adding RV350_NJ ID. 2005-07-01 21:26:43 +00:00
Jerome Glisse
7b12220256 Adapt extension string to new GL dispatch schema proposed
by Idr. This  patch is based on Idr patch to radeon driver.
Change #if 1 to #if 0 (r300_context.c:l69) for old dispatch
tab.
2005-07-01 21:22:05 +00:00
Karl Schultz
5f79d27b82 Update notes with VC7 info. 2005-07-01 21:08:00 +00:00
Karl Schultz
c136b41b09 Add windows VC7 project files to filelist for tar/zip files. 2005-07-01 20:31:41 +00:00
Karl Schultz
ee850657e6 VC7 project file for building glut lib 2005-07-01 20:25:57 +00:00
Karl Schultz
0cf67634bb VC7 project file for gears demo 2005-07-01 20:25:23 +00:00
Karl Schultz
101d05ad94 VC7 Solution file for building glut and demos 2005-07-01 20:24:49 +00:00
Karl Schultz
c5b6580c6f VC7 project file for osmesa 2005-07-01 20:23:52 +00:00
Karl Schultz
35a11c14ee VC7 project file for core mesa lib 2005-07-01 20:23:23 +00:00
Karl Schultz
ec171b7d02 VC7 project file for glu 2005-07-01 20:22:41 +00:00
Karl Schultz
2de5f6e252 VC7 project file for gdi driver 2005-07-01 20:21:45 +00:00
Karl Schultz
b64d60a2a6 Visual Studio 7 solution file for mesa lib 2005-07-01 20:19:47 +00:00
Karl Schultz
eac7688231 Don't #define __FUNCTION__ on a Microsoft C compiler new enough to have it. 2005-07-01 20:11:46 +00:00
Keith Whitwell
219f3c4489 Set fp->Opcode for OP_TEX_KILL case, fix from Ben Skeggs. 2005-07-01 17:12:29 +00:00
Karl Schultz
06abb854f0 Add new files to project. 2005-07-01 15:59:33 +00:00
Karl Schultz
7fe8696d01 Use frexp on Windows; frexpf is not available. 2005-07-01 15:58:02 +00:00
Karl Schultz
9b56781986 Fix a prototype 2005-07-01 15:56:14 +00:00
Roland Scheidegger
758f334717 convert sis and radeon driver to use spantmp2 instead of spantmp template. Remove old (pre-renderbuffer) span code instead of converting that too. Remove this old code from mach64 (the dead code was not fully converted to spantmp2 previously) too. 2005-07-01 11:28:14 +00:00
Brian Paul
8e8fa63cb4 comment-out some unused code to silence warnings 2005-07-01 02:03:33 +00:00
Brian Paul
559c494fc8 replace some free() calls with _mesa_free() 2005-07-01 02:03:00 +00:00
Brian Paul
03f52fea63 updates to file list for tarballs 2005-07-01 01:55:30 +00:00
Brian Paul
6d3284efd4 fix dependencies 2005-07-01 01:54:38 +00:00
Brian Paul
58a9573b08 added some glGetRenderbufferParameterivEXT calls, printfs, and assertions 2005-07-01 01:34:29 +00:00
Brian Paul
0d34c0158d fix typo in assertions 2005-07-01 01:30:03 +00:00
Brian Paul
f4f1c29597 Move the PYTHON2 and PYTHON_FLAGS assignments to configs/current, and
include $(TOP)/configs/current in glapi/Makefile so those vars can be
easily overridden by any system config, if needed.
2005-07-01 01:27:00 +00:00
Brian Paul
bb5c84fcbc Remove NEW_RENDERBUFFER stuff.
Now, OLD_RENDERBUFFER marks code that needs to eventually be removed when
all the drivers are updated to no longer need the SetBuffer() function.
2005-07-01 01:22:25 +00:00
Brian Paul
446e258940 remove OLD_RENDERBUFFER code 2005-07-01 01:10:36 +00:00
Brian Paul
54fb9226e4 remove OLD_RENDERBUFFER stuff 2005-07-01 01:08:29 +00:00
Brian Paul
30aea49cf6 minor fixes 2005-07-01 01:04:31 +00:00
Roland Scheidegger
cf5b2f7419 remove common macros used in the span functions of most drivers from the individual drivers and put them in common code. It is still possible for a driver to define its own macros if it has special needs. This affects CLIPPIXEL, CLIPSPAN, HW_CLIPLOOP, HW_ENDCLIPLOOP, and for drivers using the spantmp2 template also GET_SRC_PTR and GET_DST_PTR. 2005-07-01 00:08:46 +00:00
Ian Romanick
c212abf99a Replace add_newer_entrypoints (src/mesa/main/context.c) with
device-specific code.  A new Python script
(src/mesa/glapi/extension_helper.py) generates a list of all
entry-points for all known extensions.  Each driver the selects only
the extensions that it needs and enables the via either
driInitExtensions or driInitSingleExtension.

This code has been compile-tested on a drivers, but has only been
run-tested on mga and i915 (on i830 hardware).

These changes were discussed at length on the mesa3d-dev mailing list.

http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2
2005-06-30 16:00:48 +00:00
Brian Paul
1ac8ae446a remove \n from warning message string 2005-06-30 14:24:44 +00:00
Brian Paul
aa70253cbb added newline at end of file 2005-06-30 14:23:40 +00:00
Brian Paul
049e320f46 Add a set of predicate functions for testing matrices instead of directly
testing the flags field.
Move definition of all the MAT_FLAGs into the m_matrix.c file since they're
now private.
2005-06-30 14:22:23 +00:00
Brian Paul
f138b977d0 Redo all the GL_LINEAR interpolation code in terms of LERP macros/functions.
This cleans up and simplifies the arithmetic quite a bit.
2005-06-30 13:42:10 +00:00
Roland Scheidegger
4d652b7855 Fix crashes with pixel readback when using the optimized assembly functions.
Pixel count can be negative (this could be fixed elsewhere), so adapt the
functions to work with such inputs correctly (same behaviour as non-optimized
functions).
Bugzilla #2317
Submitted by idr
2005-06-30 11:42:56 +00:00
Aapo Tahkola
b0d62880e8 -"fix" page flipping
-use depth tiling if tiling is enabled
2005-06-30 04:37:19 +00:00
Brian Paul
0e55891674 fix a few glitches 2005-06-30 02:34:07 +00:00
Brian Paul
ccda2162f6 fix Darwin dynamic lib naming 2005-06-30 02:33:25 +00:00
Brian Paul
b6c0d753fa just code clean-ups and new comments 2005-06-28 03:48:08 +00:00
Vladimir Dergachev
ec17e7941a Uncomment a couple of helper functions.
Fix slipup from CVS update that was commented out and did not show up during compilation.
2005-06-27 18:46:31 +00:00
Vladimir Dergachev
b6c5116171 Rename unchecked state to match DRM driver.
Emit wait idle and pacify r300 before emitting state - this seems to improve stability.
2005-06-27 15:56:14 +00:00
Brian Paul
84f8d7aafb include t_vp_build.h 2005-06-27 00:45:36 +00:00
Brian Paul
39a488ed63 remove unused MEMSET16 macro 2005-06-27 00:39:33 +00:00
Brian Paul
2dbffb30f0 Get rid of the MESA_PBUFFER_ALLOC/FREE() macros.
If that stuff is still needed, lots of other updates are needed anyway.
Also, some misc MALLOC/FREE -> _mesa_malloc/free() changes.
2005-06-27 00:34:17 +00:00
Brian Paul
397088ff5e added _tnl_ProgramCacheDestroy() prototype 2005-06-27 00:30:56 +00:00
Brian Paul
c43f03e38d make create_new_program() static 2005-06-27 00:30:37 +00:00
Eric Anholt
3f9839a52b Fix crashes during rasterization fallback by avoiding _tnl_need_projected_coords
during fallbacks.  In one case, _swsetup_Wakeup had just been called, covering
the need there, and in the other case, we can simply exit the entire
radeonChooseVertexState function, knowing that it will be called again once we
leave the fallback.

Bugzilla #:	2516
Submitted by:	sroland
2005-06-26 21:57:23 +00:00
Eric Anholt
a4eb693b5f Remove the #if 0-ed out old span code. 2005-06-26 21:54:43 +00:00
Eric Anholt
32b898126e Explain the reason for TCL fallback when GL_SPHERE_MAP happens with
RADEON_DEBUG=fall.
2005-06-26 21:53:11 +00:00
Eric Anholt
3b817fde88 Zero out the ENGPACKET allocated on the stack, to avoid sending uninitialized
values to reserved fields on the card, resulting in all-black output and
sometimes hangs.

Submitted by:	Thomas Winischhofer
2005-06-26 21:02:58 +00:00
Brian Paul
845f2a7350 fix for-loop in _mesa_GetDouble to avoid out of bounds memory read 2005-06-26 20:08:23 +00:00
Brian Paul
f8582b6c1f check for null oldBuffer in _mesa_realloc(), cleaned up some comments 2005-06-26 19:57:17 +00:00
Brian Paul
394fd40a53 need parenthesis in realloc call 2005-06-26 19:53:52 +00:00
Ian Romanick
4e1aae6e0e Ignore files generated as part of the build process. 2005-06-24 18:54:57 +00:00
Ian Romanick
5aafea03af Fix non-x86 specific builds. The changes from glTexImage3DEXT to
glTexImage3D that caused me so many problems during the re-development
of the API scripts reared its ugly head again.  This has been fixed by
tracking the parameter string for each entry-point individually.

This has the annoying side-effect that the names of the parameters in
all aliases of a function must be the same or gl_apitemp.py will
generate bad code. :(  The changes in
src/mesa/glapi/{gl_API.xml,glapitable.h} and src/glx/x11/* are caused
by fixing the parameter names in various function aliases that didn't
match.

Reported by: Eric Anholt, Jacob Jansen
2005-06-24 18:35:31 +00:00
Jeremy Kolb
3fb86eefe8 Fixed the XCB implementation when always_array is true, thanks to Ian Romanick for pointing it out. Please review. 2005-06-24 02:28:02 +00:00
Brian Paul
1c5caba184 Remove the xmesa_set_buffer() function. No longer needed since the
span functions pass in a gl_renderbuffer to indicate which color
buffer should be drawn into.  Optimized line/triangle routines are
smart enough to know which buffer to draw into as well.
The swrast->SetBuffer() routine should eventually be removed from
all drivers.
2005-06-23 15:09:32 +00:00
Ian Romanick
2636e853f6 Mark GenQueriesARB at 'always_array="true"'. This eliminates the need
to special-case the handling of that function in glX_proto_send.py.
2005-06-22 17:11:20 +00:00
Jeremy Kolb
814e5360b0 Fixed a bug where GenQueriesARB was generating the wrong code for XCB and wouldn't compile. Not sure how that slipped through before but it should work now. 2005-06-22 02:36:23 +00:00
Ian Romanick
66a5548fbb Mammoth update to the Python code generator scripts that live in
src/mesa/glapi.  Basically, the scripts that did simple things (like
gl_offsets.py) were simple, and the scripts that did more complicated things
(like glX_proto_send.py) were getting progressively more and more out of
control.  So, I re-write the foundation classes on which everything is based.

One problem with the existing code is that the division between the GL API
database representation and the way the output code is generated was either
blury or nonexistant.  The new code somewhat follows the
Model-View-Controller pattern, minus the Controller.  There is a distinct
set of classes that model the API data, and there is a distinct set of
classes that generate code from that data.

One big change is in the class that represents GL functions (was glFunction,
is now gl_function).  There used to be an instance of this calls for each
function and for each alias to that function.  For example, there was an
instance for PointParameterivSGIS, PointParameterivEXT, PointParameterivARB,
and PointParameteriv.  In the new code, there is one instance.  Each
instance has a list of entrypoint names for the function. In the next
revision, this will allow a couple useful things.  The script will be able
to verify that the parameters, return type, and GLX protocol for a function
and all it's aliases match.

It will also allow aliases to be represented in the XML more compactly.
Instead of repeating all the information, an alias can be listed as:

     <function name="PointParameterivARB" alias="PointParameterivEXT"/>

Because the data representation was changed, the order that the alias
functions are processed by the scripts also changed.  This accounts for at
least 2,700 of the ~3,600 lines of diffs in the generated code.

Most of the remaining ~900 lines of diffs are the result of bugs *fixed* by
the new scripts.  The old scripts also generated code with some bugs in it.
These bugs were discovered while the new code was being written.

These changes were discussed on the mesa3d-dev mailing list back at the end
of May:

http://marc.theaimsgroup.com/?t=111714569000004&r=1&w=2

Xorg bug: 3197, 3208
2005-06-21 23:42:43 +00:00
Nicolai Haehnle
f292e13a20 Back out the actual enabling of depth tiling.
Depth tiling breaks software fallbacks and depth buffer reads.
radeon_span.c **must** be updated for anything that is related to tiling.
2005-06-21 17:18:00 +00:00
Nicolai Haehnle
1e4744d2b9 Add PCI ID for R420 JI.
The driver appears to work reliably (i.e. lockup-free) with a card based
on this chip. However, I have not explored whether we could get anything
in terms of 3D performance "for free" just by setting some magic bits
in those registers that are still a mystery to us.
2005-06-21 17:03:29 +00:00
Aapo Tahkola
ebd99043ed r300 driver side of color tiling support. 2005-06-21 15:41:03 +00:00
Nicolai Haehnle
a5fb15cb87 Make sure texture base addresses are used correctly.
They are relative to the card's address space, not relative to fbLocation,
which will be important once we program MC_FB/AGP_LOCATION in the way
they are programmed on older Radeon chips.
2005-06-21 15:21:14 +00:00
Brian Paul
04f863e856 check for NULL swrast->Driver.SetBuffer before calling it 2005-06-21 14:39:43 +00:00
Brian Paul
23606a5704 updated to version 29 2005-06-21 14:30:46 +00:00
Brian Paul
90b40c33e7 include light.h to silence warning 2005-06-21 03:38:10 +00:00
Brian Paul
dc137ddb3f DirectFB updates (Claudio Ciccani) 2005-06-20 18:29:28 +00:00
Jeremy Kolb
a6a3e01b09 ran "make" after update to glX_proto_send.py. 2005-06-20 03:18:16 +00:00
Jeremy Kolb
4378dee78c Fixed some issues where XCB replies were being freed and data was not being copied. 2005-06-20 03:12:35 +00:00
Brian Paul
38332a6d94 Define __FUNCTION__ as a preprocessor symbol in glheader.h if we're not
using GCC or VMS.
2005-06-19 14:57:34 +00:00
Aapo Tahkola
4e7df27466 Fix gloss breakage when using hw tnl. 2005-06-16 11:57:45 +00:00
Aapo Tahkola
3c6f17be32 Use depth tiling. 2005-06-16 11:41:19 +00:00
Aapo Tahkola
af02907b4c Support 16-bit modes. 2005-06-16 10:40:39 +00:00
Aapo Tahkola
463c1d6c57 Fix problems with elts when immediate mode is on. 2005-06-16 10:27:04 +00:00
Aapo Tahkola
0e288e58ef Turn off VBO's. 2005-06-16 10:21:01 +00:00
Aapo Tahkola
3176f8e2e1 lost_context never gets reset. 2005-06-16 10:05:18 +00:00
Jon Smirl
6c2098ffd4 Fix a few compiler warnings 2005-06-16 04:25:45 +00:00
Jon Smirl
f445aaa67a Fix linux-solo build for mga check-in 2005-06-16 03:45:48 +00:00
Ian Romanick
aa26915472 Adds support for MGA DRM version 3.2.
This patch makes use of two of the new ioctls added in MGA DRM version
3.2.  Specifically, the DRM_MGA_SET_FENCE and DRM_MGA_WAIT_FENCE
ioctls are used in mgaWaitForFrameCompletion.  As a result the MMIO
register region and the primary DMA region are *not* mapped (if DRM
3.2 is available).

This patch does *not* make use of the new get_param query was added to
differentiate between G4x0 cards and G550 cards.  That is left to a
future update.

Xorg bug: 3259
Reviewed by: Eric Anholt
2005-06-14 22:51:44 +00:00
Jouk Jansen
fb818a0b11 Committing in .
OpenVMS updates

 Modified Files:
 	Mesa/src/mesa/tnl/descrip.mms Mesa/src/mesa/tnl/t_vp_build.c
 ----------------------------------------------------------------------
2005-06-14 10:27:05 +00:00
Jon Smirl
6b9d9c5039 fbSwapBuffers needs to return a status 2005-06-13 14:21:34 +00:00
Brian Paul
2d218885ec mingw changes (Nolan Leake) 2005-06-13 14:07:14 +00:00
Vladimir Dergachev
902e70875d Fixed typos. 2005-06-12 14:57:02 +00:00
Vladimir Dergachev
b675c48027 Add definition for memory controller latency registers.. 2005-06-10 16:10:50 +00:00
Keith Whitwell
4476978856 remove debug prints 2005-06-10 14:58:32 +00:00
Brian Paul
252d8e78cc be sure we have span texcoords before calling _swrast_texture_span() 2005-06-10 14:37:32 +00:00
Brian Paul
5d6ecf25f8 pass mask array to PutRowRGB() in simple_z_textured_triangle() 2005-06-10 14:36:55 +00:00
Keith Whitwell
b4979ec178 Allow the print opcode to compile 2005-06-10 13:59:49 +00:00
Keith Whitwell
6c1948d593 Fix typo in spot attenuation 2005-06-10 13:35:31 +00:00
Keith Whitwell
729cccba5d Correct test for attenuation.
DISSASEM changes.
2005-06-10 12:04:47 +00:00
Keith Whitwell
7e8e4c500e remove depend files on clean 2005-06-10 10:43:02 +00:00
Keith Whitwell
f6e7cfb60d Fix colormaterial flag calculations.
Fix lighting alpha result.
2005-06-10 08:33:37 +00:00
Keith Whitwell
52608d2d21 Add notes about intended precision of opcodes.
Remove dead floating point twiddles.
Fix bug translating MAD->MUL,ADD.
2005-06-10 08:32:27 +00:00
Keith Whitwell
1c48986e54 Fix a couple of buglets 2005-06-09 22:10:23 +00:00
Keith Whitwell
1fc4bcbb17 Another typo 2005-06-09 19:03:18 +00:00
Keith Whitwell
44367aab2a Further clean up RoughApproxPow2 and disable the optimized version --
it's a very poor approximation.
2005-06-09 18:59:41 +00:00
Keith Whitwell
2c6e8e90ec Fix typo in RoughApproxPow2 2005-06-09 18:52:42 +00:00
Keith Whitwell
81032030ff Store compiled vertex program representations in a pointer in the
vertex_program struct.

Allow switching between regular and vertex_program implementations
of fixed function TNL with the MESA_TNL_PROG environment var
(previously this required recompilation).

Ensure program compilation only references program data, not the
wider context.  This means that compiled programs only need to be
invalidated when the program string changes, not on other state
changes.
2005-06-09 14:55:34 +00:00
Keith Whitwell
a8534885ef Build vertex programs using state from a 'state key' struct which is
distilled from the current state.

Maintain a list of vertex programs for various different tnl states
indexed by these state keys.

This cuts down the number of vertex programs generated and means that
time spent optimizing vertex programs for execution isn't wasted each
time the state changes.
2005-06-09 14:52:08 +00:00
Keith Whitwell
79b7bd18bb Turn off debug 2005-06-08 22:14:29 +00:00
Keith Whitwell
8e56122782 Add t_vb_arbprogram_sse.c 2005-06-08 22:10:34 +00:00
Keith Whitwell
ea93b2986b Runtime generate sse/sse2 code for some vertex programs. Experimental
and only active when _TNL_FIXED_FUNCTION_PROGRAM is defined *and*
the MESA_EXPERIMENTAL environment variable is set...
Works for the arbfplight demo at least.
2005-06-08 22:10:16 +00:00
Keith Whitwell
002d0ad3e9 Turn off DISASSEM 2005-06-08 22:06:29 +00:00
Keith Whitwell
562bdaf70e New arguments for sse_shufps() 2005-06-08 21:58:30 +00:00
Keith Whitwell
9899f58c76 Use ALIGN_MALLOC for parameter lists. 2005-06-08 21:57:45 +00:00
Keith Whitwell
dce3a91a8d Add some more opcodes 2005-06-08 21:56:21 +00:00
Ben Skeggs
2d2f5a4b19 - Secondary colour
- Calculate tc_count in EmitArrays (enabled units != nr texcoords).
2005-06-08 15:05:19 +00:00
Brian Paul
ee7ad16f3f regenerated 2005-06-08 13:35:28 +00:00
Brian Paul
2c7336af4e put full prototype on one line to fix gl_mangle.h generation (Dave Reveman) 2005-06-08 13:35:07 +00:00
Brian Paul
012de39c23 remove stray line 2005-06-08 13:07:33 +00:00
Keith Whitwell
60339c7062 Remove ARL opcode from interpreter.
Revert SEL opcode to MSK.
Split out t_vb_arbprogram.h header file.
2005-06-08 10:03:29 +00:00
Keith Whitwell
7fb16836e7 new file 2005-06-08 10:02:28 +00:00
Brian Paul
d45cb9a836 regenerate for latest glext.h 2005-06-08 02:18:22 +00:00
Brian Paul
681b758f11 fix some renderbuffer problems for Xserver build (Dave Reveman) 2005-06-08 02:17:10 +00:00
Brian Paul
a0b5c98364 check for double-buffered buffer in XMesaDestroyBuffer() (Dave Reveman) 2005-06-08 02:14:55 +00:00
Daniel Borca
31d0cedd78 updates from Paul Garceau 2005-06-07 19:01:33 +00:00
Brian Paul
7477a7d366 added GL libs to APP_LIB_DEPS (bug 3485) 2005-06-07 15:30:12 +00:00
Brian Paul
4417d4cb61 fix error in OSMESA_LIB_NAME line 2005-06-07 15:25:08 +00:00
Brian Paul
ed7f3aead8 fix GL_ALPHA render-to-texture problem (Jon Smirl) 2005-06-07 15:03:40 +00:00
Keith Whitwell
395280bf88 Initialize some variables. 2005-06-07 12:46:30 +00:00
Keith Whitwell
a4691981d9 Add new runtime assembly files. 2005-06-07 12:45:29 +00:00
Keith Whitwell
1d60469c4c Split out runtime assembly functions. 2005-06-07 12:45:04 +00:00
Keith Whitwell
461a2a799a New files - split off runtime assembly functions from
t_vertex_sse.c.
2005-06-07 12:44:26 +00:00
Keith Whitwell
757e0855ad Simplify interpreted language:
- Expand operand argument specifiers so that all registers and
  parameters can be referenced directly.  Remove old PAR/PRL
  instructions.

- No 3 operand instructions, translate MAD -> MUL, ADD.  (No room for
  3 full operands in instruction struct).

- Translate SWZ instructions into 1 or 2 reduced swizzles at compile
  time.

- Add hardwired code for moving input and output values to/from the
  register file.  Drop old INx, OUT instructions.
2005-06-07 10:59:37 +00:00
Keith Whitwell
17d249d31b Add a VP_MAX_OPCODE entry to allow engines with internal opcodes to
place them sensibly.
2005-06-07 10:56:17 +00:00
Daniel Borca
4f923fb0bc updates from Paul Garceau 2005-06-07 05:29:38 +00:00
Jon Smirl
c20a2b0b72 Add SetBuffer to egl driver too 2005-06-07 02:10:14 +00:00
Jon Smirl
ef9e0be0cb Add a NULL SetBuffer function to the fbdev driver 2005-06-06 21:40:55 +00:00
Brian Paul
2e7dcdd38b this is auto-generated 2005-06-06 14:40:56 +00:00
Ben Skeggs
d59fbcdee5 TEX to output 2005-06-06 07:38:29 +00:00
Ben Skeggs
3c4c6d1f80 Fix xyz/w interaction (needs a cleanup still..)
Use SRC0A instead of WZY/XXX combination for W in XYZ positions.
Remove dodgy hack from POW opcode, now works correctly without it
2005-06-05 08:25:54 +00:00
Jon Smirl
40b8b57ed4 Make install install GLES too 2005-06-05 02:10:58 +00:00
Brian Paul
df5e2b934b set OLD_RENDERBUFFER=0, need to clean up a few more things before totally removing that 2005-06-04 22:09:27 +00:00
Brian Paul
d96dd3cd49 remove old span functions from swrast_device_driver struct 2005-06-04 18:25:39 +00:00
Brian Paul
bb8b302dbc remove old span code 2005-06-04 18:12:28 +00:00
Brian Paul
5ec5c6b222 fix an assertion 2005-06-04 17:53:30 +00:00
Brian Paul
863bd56520 remove old span code 2005-06-04 17:45:50 +00:00
Brian Paul
5821f3d70c added comment 2005-06-04 17:44:42 +00:00
Karl Schultz
5b10d71559 Fixup file lists for tarball/zip file creation.
- Adjust for recent changes to Windows build files.
- Add in at least some of the new slang files - enough to build on
Windows, but some of the other slang-related files may still need to be
added.  (Will probably get corrected just prior to next release, if needed)
2005-06-03 15:24:55 +00:00
Karl Schultz
516546ad5b Updates for new Windows build system. 2005-06-02 23:17:02 +00:00
Brian Paul
3fe9c40cb2 Remove last of the old span code. 2005-06-02 04:09:05 +00:00
Brian Paul
13c8f985d9 oops, undo previous change 2005-06-02 04:07:08 +00:00
Brian Paul
1516f559bc start removing old (pre-renderbuffer) span code 2005-06-02 04:05:45 +00:00
Jouk Jansen
c4fbdb090c Committing in .
OpenVMS makefile added

 Added Files:
 	Mesa/src/mesa/shader/grammar/descrip.mms
 ----------------------------------------------------------------------
2005-06-01 12:07:15 +00:00
Jouk Jansen
589a3a3f6e Committing in .
Update OpneVMS compilesupport

 Modified Files:
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/shader/slang/slang_compile.c
 	Mesa/src/mesa/shader/slang/slang_storage.c
 	Mesa/src/mesa/shader/slang/slang_storage.h
 ----------------------------------------------------------------------
2005-06-01 12:05:34 +00:00
Eric Anholt
f090fdc50b Move fallback and other debugging under TDFX_DEBUG using the same mechanism
as other drivers.
2005-06-01 08:22:57 +00:00
Eric Anholt
d638f6a0bb Add no_rast option. 2005-06-01 07:44:52 +00:00
Keith Whitwell
502504de23 Add a mode to test flat shading + separate specular. 2005-06-01 07:02:23 +00:00
Eric Anholt
f772e3dd15 Fix the 3dfx driver by correcting what appears to be a typo GL_RGBA8 instead
of GL_RGBA in driNewRenderbuffer of the backbuffer.
2005-06-01 02:59:12 +00:00
Brian Paul
c7264415b6 added code to detect GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT error 2005-06-01 00:50:23 +00:00
Brian Paul
1b93953fbc add support for GL_RENDERBUFFER_RED/GREEN/BLUE/etc_SIZE_EXT querie 2005-05-31 23:55:21 +00:00
Brian Paul
5d5100aabc remove temporary GL_EXT_framebuffer_object info 2005-05-31 23:54:44 +00:00
Brian Paul
2e081cd90e updated to version 28 2005-05-31 23:54:24 +00:00
Eric Anholt
0009e3d97d Bugzilla #2708: Disable the fallback on GL_SPHERE_MAP. It appears to hurt more
than it helps, and we seem to have a handle on how to fix it.
2005-05-31 23:32:47 +00:00
Alan Hourihane
628b18b8ca Add Intel(R) 945G support (Keith Whitwell, Tungsten Graphics) 2005-05-31 18:10:03 +00:00
Aapo Tahkola
4ec6eceea9 Causes lockups on some rare cases. 2005-05-31 05:53:38 +00:00
Eric Anholt
8c2a9a9166 Pull locking out of HW_LOCK/UNLOCK and into SpanRenderStart/Finish. Also do
some cleanups on the span macros.  This does not deal with the brokenness of
depth spans, but makes the code more readable.
2005-05-31 05:31:43 +00:00
Eric Anholt
ef377c3c00 Correct the descriptions of the glBlend{Equation,Func} fallbacks in r128, and
remove those descriptions and the corresponding bits on r200, where they're no
longer used.
2005-05-31 04:26:13 +00:00
Eric Anholt
b79c47e90c Remove unused CTX_ARG2 define. 2005-05-31 04:13:45 +00:00
Eric Anholt
8a1df96862 Bugzilla #2195: Convert the radeon driver to the t_vertex interface. This cuts
about 200 lines from the code and 25k from the binary, while matching other
drivers more closely.  In the worst case (tcl_mode=0) it appears to have
a performance cost of 4.4% +/- 0.3% on quake3 (800x600 demofours, 1ghz p3,
rv200).  Tested on ut2004, ut, q3, projtex.

Submitted by:	Andreas Stenglein <a.stenglein@gmx.net>
2005-05-31 04:04:24 +00:00
Eric Anholt
9dff2ca07a Move fallback debugging under MACH64_DEBUG=fall (matching other drivers) and
add pretty descriptions of the bits.  GC one of the bits that was unused.
Also, now only the first thing triggering a fallback and the last thing
requiring one do the debug output.  This also matches other drivers.
2005-05-31 03:47:39 +00:00
Eric Anholt
12eabeb3b9 Pull locking out from HW_LOCK/UNLOCK into SpanRenderStart/Finish. Provides a
factor of 5+ improvement in no_rast glxgears and 2.3 in no_rast quake3 (n=1,
320x240, 16bpp, low qualities, 1ghz p3)
2005-05-30 08:07:03 +00:00
Eric Anholt
c7f8d36451 Fix software fallbacks by being safe with macro arguments in READ/WRITE_DEPTH.
Convert to spantmp2.h while I'm here.  Tested with 16 and 32bpp no_rast
glxgears.
2005-05-30 06:50:17 +00:00
Eric Anholt
993d8ad5ef Add the no_rast debug option to mach64. It shows that software fallbacks are
pretty broken.
2005-05-30 06:41:19 +00:00
Eric Anholt
b328dded75 Pull hardware locking out into SpanRenderStart/Finish rather than
HW_LOCK/UNLOCK. Provides a 61% performance improvement in no_rast=true quake3
(n=2, 320x240, 16bpp, p4 1ghz), and a factor of 3 improvement in no_rast
glxgears.
2005-05-30 06:15:29 +00:00
Eric Anholt
c1b87b2a06 Add the description of the no_rast option fallback so that MGA_DEBUG=fall
doesn't segfault with no_rast.
2005-05-30 06:11:22 +00:00
Eric Anholt
0936eeb456 Add the no_rast debug option, which I used in some testing. 2005-05-30 03:32:52 +00:00
Eric Anholt
f2149a7a66 Remove unused CTX_ARG2. 2005-05-30 01:59:39 +00:00
Eric Anholt
0b73889d54 Put some fallback debugging output under DEBUG_FALLBACKS. 2005-05-28 23:45:39 +00:00
Eric Anholt
2962f88189 Add a missing EnsureCmdBufSpace, matching r200. 2005-05-28 22:56:16 +00:00
Eric Anholt
f054fa85d8 Add a freebsd-dri-amd64 config, and quiet makedepend slightly by making an
EXPAT_INCLUDES config variable (set on FreeBSD) which is then used in
Makefile.template's INCLUDES.
2005-05-28 20:17:06 +00:00
Jerome Glisse
2ed4c296d9 Some fixes 2005-05-28 12:18:32 +00:00
Dave Airlie
22b0a42465 use shared-core 2005-05-28 10:55:23 +00:00
Ben Skeggs
0bae91562e Up MAX_AOS_ARRAYS to 16. Do we need more? 2005-05-28 05:20:05 +00:00
Ben Skeggs
908dbc44c2 Play with swizzling a bit. 2005-05-28 03:19:56 +00:00
Aapo Tahkola
74e412c695 Programmable per-vertex point sizes and proper result reg assigns. 2005-05-28 01:02:00 +00:00
Aapo Tahkola
0080faf83e More optimal r300Clear. 2005-05-27 20:10:05 +00:00
Brian Paul
d322810e13 properly pop the GL_TEXTURE_GEN_ enable state 2005-05-27 14:44:14 +00:00
Karl Schultz
6580a6d561 Account for moved/new/removed files. 2005-05-26 18:22:13 +00:00
Ian Romanick
70dbbbf89a Fix gl_enums.py so that enums that are listed with the same name in
multiple places don't get generated multiple times.
2005-05-26 16:59:47 +00:00
Ian Romanick
497dd3e920 Minor correction to EXT_framebuffer_object XML. Fix gl_table.py so that it
generates the correct script name in the generated output.
2005-05-26 16:34:58 +00:00
Ian Romanick
249db89b00 Make a couple minor corrections to gl_API.xml. Fixes the name of an
extension that was missing the GL_ part and uses the core GL type names for
vertex buffer object functions instead of the ARB names.

Also commits the resulting changes to the generated code.  Some how, the
#if sequence disappeared in the 1.52 version of glapi_x86.S.
2005-05-26 16:24:35 +00:00
Keith Whitwell
020225496e Bump driver date. 2005-05-26 11:42:19 +00:00
Dave Airlie
69509641a8 make egl build first so we don't get wierd drivers linking to libs not available
yet
2005-05-26 04:24:09 +00:00
Dave Airlie
978d2fda3c make linux-solo and linux-solo-x86 config files hierarchical 2005-05-26 03:47:34 +00:00
Ben Skeggs
ae516306b4 constant tracking 2005-05-26 02:33:57 +00:00
Dave Airlie
e45b5a4fa8 use shared-core rather than shared 2005-05-26 01:40:34 +00:00
Dave Airlie
8e5099d6a0 use shared-core instead of shared 2005-05-26 01:40:00 +00:00
Ian Romanick
d2ee346a93 Fix a couple typeos in enum names. 2005-05-25 21:00:16 +00:00
Michal Krol
170999a103 change local var names from "asm" to "assem" - I guess it caused
gcc 3.3.5 to break, but not tested it
2005-05-25 15:09:32 +00:00
Michal Krol
d1834e8c10 a small utility to convert .syn files to its binary forms;
does not require any command line params;
2005-05-25 14:58:22 +00:00
Michal Krol
0432411837 silencium gcc warnings 2005-05-25 14:27:59 +00:00
Michal Krol
0f71c6691e add shader/slang/slang_assemble_assignment.c 2005-05-25 14:24:34 +00:00
Michal Krol
fc534034cc more slang code 2005-05-25 14:23:00 +00:00
Michal Krol
1de60fe47f ncrease stack size 2005-05-25 14:19:24 +00:00
Michal Krol
c16264b138 update grammar_mesa.c path 2005-05-25 14:00:22 +00:00
Michal Krol
1aadf1c039 moved from mesa/shader to mesa/shader/grammar 2005-05-25 13:58:36 +00:00
Michal Krol
1008f57f6f remove the GLSL spec wording;
reorder some elementary operators;
disable assignment "=" and equality "==" "!=" operators - they are
handled internally by the assembly generator;
fix minor typos
2005-05-25 13:43:32 +00:00
Michal Krol
2b73e5aaaf add mesa/shader/grammar to include list 2005-05-25 13:37:56 +00:00
Michal Krol
863eca9973 stand-alone vertsions of grammar_mesa - used by utilities;
DO NOT BUILD UNDER MESA
2005-05-25 13:35:39 +00:00
Keith Whitwell
39e14d2cff Provide initial values for some variables. 2005-05-25 13:35:21 +00:00
Keith Whitwell
741b980433 add special case for flat shaded + separate specular triangles 2005-05-25 13:34:52 +00:00
Michal Krol
3f6d985753 change the behaviour of enter and local_addr instructions 2005-05-25 13:20:59 +00:00
Keith Whitwell
49109d01c0 Disable polygon stipple - it seems to break if certain specific stipple
patterns are used, including the one generated by conform.
2005-05-25 10:17:19 +00:00
Keith Whitwell
8286abd798 Fix various issues with cliprects and MakeCurrent 2005-05-25 10:14:39 +00:00
Ben Skeggs
53d13e014f - Remove one of the loops in emit_arith
- Handle REPL_ALPHA in emit_arith (possibly incorrect for some things)
- Start on getting demos/arbfplight.c to look right.  Won't be animated yet,
  need to re-work const emit so we can update consts without re-translating
  the entire program.

Assertion in r300_state.c::setup_rs_unit needs to be disabled for it to
work.
2005-05-25 06:46:10 +00:00
Ian Romanick
f387c83ec1 Commit the changes propagated from Jeremy Kolb's changes to the Python
scripts in src/mesa/glapi.
2005-05-25 03:30:06 +00:00
Ian Romanick
e87ab8c05f Only use x86 / SSE assembly when USE_X86_ASM / USE_SSE_ASM are defined.
This makes the driver build on x86-64 again.
2005-05-24 23:03:15 +00:00
Karl Schultz
6b5afb0036 Cleanup some Windows junk. 2005-05-24 22:16:27 +00:00
Karl Schultz
89bf62cd49 project file for glut library 2005-05-24 22:06:59 +00:00
Karl Schultz
5dc31379c4 fix location of gears project 2005-05-24 22:04:03 +00:00
Karl Schultz
c97a3a3038 project file to build gears 2005-05-24 21:57:45 +00:00
Karl Schultz
7df5eddf6a Visual Studio 6 project file to build GLUT and some demos. 2005-05-24 21:51:58 +00:00
Karl Schultz
f7c0c4f485 moved to windows build dir 2005-05-24 21:17:42 +00:00
Karl Schultz
b4c8b34534 moved to windows build dir 2005-05-24 21:15:52 +00:00
Karl Schultz
45ab8cb08a Major code cleanup and begin using new render buffer interface. 2005-05-24 21:12:43 +00:00
Karl Schultz
b31b1f44f1 Change prototype for TextureMemCpy to return void* (was void). 2005-05-24 21:06:41 +00:00
Karl Schultz
7708b75d72 Visual Studio 6 project file for OSmesa library. 2005-05-24 21:02:51 +00:00
Karl Schultz
c73968af95 Visual Studio 6 project file for core Mesa. 2005-05-24 21:01:55 +00:00
Karl Schultz
9a726cdf8f Needed to build .cc files in Visual Studio 6. 2005-05-24 21:01:05 +00:00
Karl Schultz
7179810375 Visual Studio 6 project file for GLU library. 2005-05-24 21:00:03 +00:00
Karl Schultz
a1b07e187e Visual Studio 6 project file for Windows GDI driver. 2005-05-24 20:59:07 +00:00
Karl Schultz
39c0e51329 Visual Studio 6 workspace for Mesa libraries. 2005-05-24 20:57:15 +00:00
Karl Schultz
2f9722863d Removing in favor of new Windows build directory. 2005-05-24 20:50:56 +00:00
Daniel Borca
731f1b12a0 remove stupid flags 2005-05-23 22:02:53 +00:00
Keith Whitwell
2d5f12ae6b Initialize hw stencil renderbuffer. 2005-05-23 21:10:01 +00:00
Keith Whitwell
afa7f6a0f5 Disable recent sse change pending more testing. 2005-05-23 14:31:44 +00:00
Ben Skeggs
eeada48497 Implement enough of ARB_fragment_program for Keith's texenv program
generation in Mesa.  Requires most recent Mesa cvs to work correctly.

Swizzle code is possibly slow/buggy and will probably be replaced.

Old behaviour can be controlled by a #define in r300_context.h, if
no-one minds I'll remove the old code later on.

Also, disabled cube map extension.  AFAIK We don't support it yet,
and it causes issues with UT2004.
2005-05-23 14:14:19 +00:00
Keith Whitwell
0c4731b27c Use SSE for vertex emit -- another good speedup. 2005-05-23 12:25:43 +00:00
Keith Whitwell
17bcf9f816 Import Thomas Helstrom's SSE memcpy code from the via X.org driver.
Add a TextureMemCpy callback, called from texstore.c when copying
texture data via the memcpy_texture() path.
Enable this code in the via driver - 100% speedup in texdown.c results.
2005-05-23 12:17:27 +00:00
Keith Whitwell
eb9d6f44a9 silence gcc warnings 2005-05-23 12:15:19 +00:00
Keith Whitwell
241b6b7ab1 Detect use of disabled textures as tex_env_crossbar sources. 2005-05-23 09:50:34 +00:00
Keith Whitwell
2dea6df80b Support ARB_texture_env_crossbar. Changes the way programs are
generated somewhat, with all TEX instructions now emitted at the head
of the program.
2005-05-23 09:37:32 +00:00
Keith Whitwell
6fe176a648 Restore the negate() function.
Add Ben Skegg's ATI_texture_env_combine3 support.
2005-05-23 08:08:43 +00:00
Jerome Glisse
eb8be5d923 Small change to handle native case (7 natives case) 2005-05-22 12:24:52 +00:00
Jerome Glisse
446980473d Adding r300 fragment program swizzle tab. Please some
one reread macro at begining see if i made any error.
A full reread would also be usefull there may be some
errors for some swizzle despite the great care i took
to done them :)
2005-05-22 12:06:50 +00:00
Ian Romanick
b70a47736a Add support for modes with a depth-buffer but no stencil-buffer. This
eliminates various "3D driver claims to not support visual" messages in
16-bit color mode.
2005-05-20 18:40:11 +00:00
Keith Whitwell
3cc2f82bb5 Remove debug printfs 2005-05-20 15:12:12 +00:00
Keith Whitwell
923515b3f8 Re-enable X11 optimized triangle funcs. 2005-05-20 15:06:41 +00:00
Brian Paul
e3e8067db7 use MAX_SCREENS instead of hard-coded number 2005-05-20 14:11:11 +00:00
Brian Paul
8f384f0b67 fix reversed strstr() args, print mode string 2005-05-20 14:03:35 +00:00
Brian Paul
e58d32947e replace // with /* */ 2005-05-20 14:02:02 +00:00
Jouk Jansen
063efce6ee Committing in .
Update openVMS compile support

 Modified Files:
 	Mesa/progs/demos/descrip.mms
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2005-05-20 11:43:54 +00:00
Jon Smirl
bab559b1fa Remove some debug output
Add #if DEBUG_FRAG in s_nvfragprog.c
2005-05-20 01:17:38 +00:00
Adam Jackson
8f8e0f0b01 Use the 1.3 names for FogCoord* 2005-05-20 00:44:37 +00:00
Keith Whitwell
18a74321aa Invalidate current fastpath on changes to attribute size or offset within
the vertex.

Use existing facilities to check for sse2 and enable when available.

Turn on SSE/SSE2 codegen for t_vertex.c by default when USE_SSE_ASM is
defined.  Disable with "MESA_NO_CODEGEN=t".
2005-05-19 20:25:32 +00:00
Keith Whitwell
c2745ffa49 Cope with the common 3ub and 1ub cases.
Fix a few typos.
Note that sse_movss sets high dwords to zero when reading from memory.
Fix a few related bugs.
2005-05-19 19:02:46 +00:00
Keith Whitwell
9557401a98 Re-initialize viewport shadows each time. 2005-05-19 19:01:47 +00:00
Keith Whitwell
67cc1f6ba6 move osmesa demos to their own directory 2005-05-19 15:39:37 +00:00
Jon Smirl
c70dace694 Fix EGL fbdev palette problem. demo3 can save ppm of screen 2005-05-19 15:03:31 +00:00
Keith Whitwell
6040d34109 Rename emit functions to reflect instruction set in use (ie
x86,sse,sse2,mmx).  Add paths for sse+mmx vs. the initial version
which assumed sse2 was available everywhere.
2005-05-19 14:42:09 +00:00
Brian Paul
8608978aba remove the XFree86 ID line 2005-05-19 13:32:41 +00:00
Michal Krol
02168254a8 intermediate code generator (not finished);
generic back-end interpreter (interprets directly intermediate code)
2005-05-19 11:50:53 +00:00
Michal Krol
e5ff2b94ff add static_assert macro 2005-05-19 10:22:28 +00:00
Michal Krol
216f89318e fix info log grabbing 2005-05-19 09:28:01 +00:00
Aapo Tahkola
e3cdbca63f Ditch unused code and features that arent in subject to get supported any near time. 2005-05-19 00:03:50 +00:00
Ian Romanick
6bc9ea1df9 In addition to dead-code removal and other clean-up, bump the required DDX
version from 1.0.0 to 1.1.1.  1.1.1 is over a year and a half old at this
point, so it should be pretty widespread.  This allows the linecomp_sane
field to be eliminated from mga_screen_private_s.
2005-05-18 22:49:59 +00:00
Jon Smirl
9a1b5af333 Fix inverted y for egl fbdev, add egl demo3 2005-05-18 20:44:23 +00:00
Brian Paul
8818eae253 To better exercise pixel packing, replace regular glReadPixels with four
ReadPixels that get the image piece by piece.
2005-05-18 15:44:13 +00:00
Keith Whitwell
2b2bd08589 Remove old t_vertex.c codegen infrastructure, tie in new code.
Currently disabled, can enable with MESA_EXPERIMENTAL=t.
2005-05-18 15:26:48 +00:00
Keith Whitwell
dc7fc17396 Fix a few typos, initialize p->identity. 2005-05-18 14:04:19 +00:00
Keith Whitwell
96582f4f28 Eliminate a couple of swizzles. 2005-05-18 14:03:02 +00:00
Keith Whitwell
dd4c1dd038 Generates working SSE code for gears under the swrast driver. 2005-05-18 12:26:21 +00:00
Keith Whitwell
b745bf08cd Checkpoint commit: Preliminary version of a facility to emit x86/sse code
to implement vertex emit functions for the t_vertex.c mechanism.
2005-05-18 10:04:27 +00:00
Aapo Tahkola
2f74adc41f Stick texture LOD back on. 2005-05-18 08:43:30 +00:00
Aapo Tahkola
e53fc72f67 Polygon mode fixes. 2005-05-18 08:22:36 +00:00
Jon Smirl
bd565e4bb7 Fix for writing the wrong sysfs variable when blanking 2005-05-18 02:48:44 +00:00
Jon Smirl
9a3da7ea7b Implement fbdev swapbuffers() 2005-05-18 01:44:11 +00:00
Ian Romanick
6e56f905d0 More comments. More dead-code removed. More clean-up. 2005-05-18 00:37:32 +00:00
Keith Whitwell
2860e5f536 Disable leftover debug statements 2005-05-17 22:21:08 +00:00
Brian Paul
22652f952f fix some BCOMP/ACOMP typos (fixes Brad King's vtk failures) 2005-05-17 19:29:46 +00:00
Brian Paul
ae818ed1da don't include strings.h 2005-05-17 18:44:33 +00:00
Brian Paul
198d6d05b0 remove eglQueryDisplayMESA() 2005-05-17 13:22:13 +00:00
Brian Paul
5a0cb726d1 fix pbuffer sample code 2005-05-17 13:21:46 +00:00
Brian Paul
d2ab4eb2c2 remove glmode stuff 2005-05-17 13:21:12 +00:00
Jon Smirl
2ec2e94e2e Check error return from _eglInitPbufferSurface() correctly 2005-05-17 03:48:38 +00:00
Jon Smirl
40c1c723fb Compute stride in the right order 2005-05-17 03:38:06 +00:00
Brian Paul
bf7f998f39 Added software-based pbuffer support (untested).
Use _eglConfigToContextModesRec() function and remove need for
the _EGLConfig->glmode struct.
Silence some compiler warnings.
2005-05-17 02:18:38 +00:00
Brian Paul
bb2c65200c updated demoCreatePbufferSurface() 2005-05-17 02:15:38 +00:00
Brian Paul
5119056324 update comments 2005-05-17 02:14:44 +00:00
Brian Paul
4c80f8df46 more work on _eglConfigToContextModesRec() 2005-05-17 02:13:00 +00:00
Jon Smirl
e03b5cdf3f Make EGL_NO_MODE_MESA work. 2005-05-17 02:12:29 +00:00
Brian Paul
167b141e6e added _eglInitPbufferSurface() 2005-05-17 02:12:26 +00:00
Jon Smirl
d06da50888 Fix several internal problems with generating the list of configs. 2005-05-17 00:59:13 +00:00
Ian Romanick
c1082804a8 Rearranged some code and added some comments to mgaAllocDmaLow. The
modified code performs identically, but cuts 16KiB from the resulting
mga_dri.so.
2005-05-16 23:23:51 +00:00
Felix Kuehling
ffd97d20aa Don't use _mesa_swizzle_ubyte_image if all three texture formats
involved in _mesa_textore_argb/rgba8888 (source, base-internal,
destination) differ. _mesa_swizzle_ubyte_image knows only about two of
the formats and can't handle the case that all three are different
correctly. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=3111.
2005-05-16 23:01:09 +00:00
Brian Paul
a33f0d3024 remove -ansi -pedantic -D_POSIX_C_SOURCE=199309L from CXXFLAGS 2005-05-16 19:07:45 +00:00
Jon Smirl
380991cb65 Implement query of surface type. 2005-05-16 16:50:38 +00:00
Jon Smirl
3e8001a465 Add error about write permission to fbdev attribs 2005-05-16 15:51:05 +00:00
Brian Paul
af1a729972 another GLX / XCB patch (Jeremy Kolb) 2005-05-16 14:12:46 +00:00
Keith Whitwell
cf4f3c5061 Deal better with indirection and indirection accounting, developed
with Ben Skeggs.
2005-05-16 12:15:01 +00:00
Keith Whitwell
4cf20d9236 Apply r200 tcl fix to radeon - compiles but untested. 2005-05-16 08:36:28 +00:00
Brian Paul
72a313902b EGL_MESA_copy_context stuff 2005-05-16 02:21:57 +00:00
Brian Paul
f9bad3dfea use EGLint instead of unsigned long for eglCopyContextMESA, added comments 2005-05-16 02:21:08 +00:00
Brian Paul
a495ed372f separate ext strings with a space 2005-05-16 02:17:49 +00:00
Brian Paul
d9789b7861 s/Atrib/Attrib/, set extension enable flags 2005-05-16 02:16:33 +00:00
Brian Paul
51ac95ba89 added boolean extension flags to _EGLDriver 2005-05-16 02:15:42 +00:00
Brian Paul
6493bd07a7 restore _eglSetConfigAttrib (for now), added prototype _eglConfigToContextModesRec() 2005-05-16 02:14:50 +00:00
Brian Paul
7bfe8df08a define M_E if needed 2005-05-16 01:32:57 +00:00
Brian Paul
5873faf39b make _eglSetConfigAtrib() a static function, and rename it 2005-05-16 00:45:03 +00:00
Brian Paul
fdeda9c458 remove MESA suffix from _eglInitScreenSurface, use swAlpha value 2005-05-16 00:32:09 +00:00
Brian Paul
9b134f641c minor tweaks 2005-05-16 00:31:29 +00:00
Brian Paul
efeea95dcc fix GetRow parameters (Nicolai Haehnle) 2005-05-15 21:26:11 +00:00
Jon Smirl
45472672a2 A few egl patches needed for glitz, mainly config BITS 2005-05-15 04:00:59 +00:00
Aapo Tahkola
aca2e0da3c Make gleans polyoffset test happy. 2005-05-14 17:41:57 +00:00
Aapo Tahkola
d5084d42d4 Dont assume GLbooleans are ones when true. 2005-05-14 16:52:32 +00:00
Nicolai Haehnle
578f63f2bf Cleanup blend state generation.
Do not set the NO_SEPARATE bit, as it causes problems with some
combinations of blend functions.
2005-05-14 14:56:25 +00:00
Jon Smirl
1c606a9aa1 Add empty placeholder for eglCopyContextMESA 2005-05-14 14:54:38 +00:00
Nicolai Haehnle
09f433b97c The kernel doesn't like command buffers over 64KB, so we don't
allocate buffers bigger than that.
2005-05-14 14:51:17 +00:00
Jon Smirl
8110df4f61 Fix compiler warning about missing parameter list 2005-05-14 14:11:11 +00:00
Nicolai Haehnle
9cf35d2876 Remove dead span functions code. 2005-05-14 12:19:05 +00:00
Nicolai Haehnle
11bd5c1ac4 Fix span functions for stencil buffer access. 2005-05-14 11:43:04 +00:00
Nicolai Haehnle
686e9b9f57 Don't print debug messages unless the user explicitly requested them
using the RADEON_DEBUG environment variable.
2005-05-14 09:17:28 +00:00
Jon Smirl
aecc05627a Add forgotten demo2.c
VS: ----------------------------------------------------------------------
2005-05-14 03:51:18 +00:00
Jon Smirl
d0ddf190aa Fix compile error in demo egl driver 2005-05-14 03:49:55 +00:00
Jon Smirl
5cb977fedf Forgot to add fb_egl.c 2005-05-14 03:22:48 +00:00
Nicolai Haehnle
296428dcf4 Make software fallbacks work again:
We need to plug in swsetup functions into the TNL module's callbacks.
Also, resize the framebuffer size when the drawable size changes.
2005-05-13 21:29:17 +00:00
Nicolai Haehnle
ee83a1302f Remove quiescence sequence from r300ClearBuffer.
The DRM is responsible for emitting this quiescence sequence when
appropriate.
2005-05-13 21:00:11 +00:00
Jon Smirl
7012d01d88 First attempt at getting egl support up on dumb framebuffer.
Seems to be mostly working. Not all of egl API is implemented.
2005-05-13 18:31:35 +00:00
Nicolai Haehnle
a6ed129dfc Patch from Jeff Smith:
The type of vertex data is opaque in the emit_* functions, so use GLvoid*
instead of char*. This also eliminates some compiler warnings.
2005-05-13 18:03:24 +00:00
Nicolai Haehnle
733bc876ee Patch from Jeff Smith:
Fix a WARN_ONCE format string.
2005-05-13 17:44:22 +00:00
Alan Hourihane
64034c4fb5 Remove MAX_VISUAL limitations of 100. If running dual head this can
be easily consumed. There are no limitations now and the VisualTable
is realloced when necessary.
2005-05-13 11:56:13 +00:00
Keith Whitwell
846eb333ae Calculate render inputs for tcl stage correctly (hint: they aren't the
same as tnl->render_inputs).  Fixes recent tcl problems.
2005-05-13 09:15:50 +00:00
Ian Romanick
c9a69a6968 Remove some unused structure fields, add some comments, and ifdef out some
dead code.  This is just some clean-up work which should not have any
functional impact.
2005-05-12 23:15:38 +00:00
Keith Whitwell
269e3895d9 new MESA_DEBUG option: disassem 2005-05-12 10:28:43 +00:00
Keith Whitwell
5c72837af9 Rein in debug slightly 2005-05-12 10:22:29 +00:00
Keith Whitwell
5f430c9976 Turn disassem off (oops). 2005-05-12 09:31:33 +00:00
Keith Whitwell
714be699be Add check for mask == NULL to the one routine missing it. 2005-05-12 09:07:12 +00:00
Keith Whitwell
10432bcc0a When lighting is enabled, but no lights are enabled, the scenecolor
becomes the result of lighting.  When lighting is disabled,
pass-through incoming color value.  Likewise, pass through incoming
texture values.  (Based on patch by Aapo Tahkola)

Add compile-time configuration to switch between DP4 and MUL/MAD for
matrix-vector multiplications.
2005-05-12 08:54:13 +00:00
Ben Skeggs
69a2f7cdd5 fix warnings in r300_texstate.c (Jeff Smith) 2005-05-12 03:53:18 +00:00
Karl Schultz
db21f1c84f The "P" suffix on APIENTRY and GLAPIENTRY is to be used for pointers to
functions, not for functions that return pointers.  Restore protoype
for glGetString back to its correct form.
2005-05-11 22:01:20 +00:00
Aapo Tahkola
4e68f4c1fa VBOs. 2005-05-11 17:28:13 +00:00
Keith Whitwell
1e5772f0ba Don't let FragmentProgram._Active influence choice of vertex vs pixel
fog.
2005-05-11 16:30:02 +00:00
Keith Whitwell
ac6728d2d9 Previously in TXP and TEX instructions, lambda was passed to
fetch_texel as zero, but I believe this is incorrect.  The spec uses a
pseudocode function:

      vec4 TextureSample(float s, float t, float r, float lodBias,
                         int texImageUnit, enum texTarget);

to specify the behaviour of TEX, TXB and TXP instructions.  For TEX
and TXP, lodBias is passed as zero, TXB is passed with texcoord[4].  In our code we have

      static void
      fetch_texel( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
                   GLuint unit, GLfloat color[4] )

and were passing zero and a biased lambda value respectively.  The
difference is that TextureSample() would add in the lambda term
itself, while in our code the caller is expected to do this.  Thus in
the TEX and TXP cases, it is necessary to pass an unbiased lambda
value for things to work out correctly.
2005-05-11 16:28:33 +00:00
Keith Whitwell
49d8cbe8d1 Use _mesa_memset rather than memset 2005-05-11 15:18:59 +00:00
Keith Whitwell
9d148e6b2b Don't let FragmentProgram._Active influence choice of vertex vs pixel
fog.
2005-05-11 15:18:23 +00:00
Keith Whitwell
363d0bcf01 Test for texcoord[3] == zero before dividing. Not so sure about this
test - if texcoord[3] is zero, we'd probably be fine except for an
ASSERT in IROUND_POS() which gets triggered by the inf values
created.
2005-05-11 15:17:31 +00:00
Keith Whitwell
e490242b9a Fix glean/conform problems. Don't generate so much output when
disassembling.
2005-05-11 15:16:35 +00:00
Keith Whitwell
a582015905 Fix valgrind complaint, conform vertex order test. 2005-05-11 10:30:13 +00:00
Keith Whitwell
3509fd8c1b Rename temp_flag to temp_in_use. Use ctx->Const.MaxVertexProgramTemps
rather than MAX_NV_VERTEX_PROGRAM_TEMPS and deal with this possibly
being greater than 32.
2005-05-11 08:34:19 +00:00
Keith Whitwell
93cd9237d7 Fix logic for allocating texture temporaries (Ben Skeggs).
Rename temp_flag, tex_temp_flag to make this clearer.
Respect ctx->Const.MaxFragmentProgramTemps limit.
2005-05-11 08:30:23 +00:00
Adam Jackson
1243b829bb int -> size_t to fix compile on LP64. 2005-05-11 01:33:50 +00:00
Keith Whitwell
2fcaf7a529 Ensure programs don't overflow allocated instruction store. 2005-05-10 18:24:50 +00:00
Keith Whitwell
a42fe19d8d Fix some valgrind complaints 2005-05-10 18:22:19 +00:00
Keith Whitwell
e57d5c4742 fix some valgrind complaints 2005-05-10 18:10:32 +00:00
Keith Whitwell
5a5b4436cb Improved detection of program changes. 2005-05-10 18:10:00 +00:00
Keith Whitwell
3ffe8731e6 Double-buffer generated instructions and only notify driver when the
generated program differs from the previous one.
2005-05-10 18:09:17 +00:00
Keith Whitwell
c5f5055097 Fix some valgrind complaints 2005-05-10 18:08:25 +00:00
Keith Whitwell
dbeea25bb8 Double-buffer generated instructions and only notify driver when the
generated program differs from the previous one.
2005-05-10 13:57:50 +00:00
Keith Whitwell
f29f2fc294 reduce the use of malloc and strdup for parameter lists 2005-05-10 13:56:23 +00:00
Keith Whitwell
ab81d1fd99 don't be fooled into emitting padding for wpos when not used 2005-05-10 13:54:52 +00:00
Keith Whitwell
d9fdb6c2bb Missing from previous commit 2005-05-10 11:41:33 +00:00
Keith Whitwell
9eef0da109 Update for FragmentProgram._Active 2005-05-10 11:40:52 +00:00
Keith Whitwell
8b88f62fbd Better driver notification on changes. 2005-05-10 11:39:50 +00:00
Keith Whitwell
948fa3b295 get fog working with _TexEnvProgram 2005-05-10 11:38:56 +00:00
Keith Whitwell
586f2c59fe Temporary fix - delete and recreate texenvprogram so that drivers
notice when it changes.
2005-05-10 10:25:16 +00:00
Jouk Jansen
e3b0c19ec9 Committing in .
OpenVMS compile support update for new buffer-code

 Modified Files:
 	Mesa/src/mesa/drivers/x11/descrip.mms
 	Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms
 ----------------------------------------------------------------------
2005-05-10 10:15:30 +00:00
Keith Whitwell
9ca8815d3b Fix texenv segfault. Reported by Ben Skeggs. 2005-05-10 09:56:02 +00:00
Keith Whitwell
ecb6bfc0ce Try not to use the same temp reg as a TXP destination more than once,
as this also constitutes a texture indirection.  Reported by Ben
Skeggs.
2005-05-10 08:58:44 +00:00
Daniel Borca
fee163a61a pathetic attempt to accomodate new frambuffer changes (still some work to do) 2005-05-09 22:15:24 +00:00
Daniel Borca
0e26580c90 accomodate new frambuffer changes 2005-05-09 22:14:58 +00:00
Daniel Borca
c8542705f7 fix some typos in FX code 2005-05-09 22:14:32 +00:00
Keith Whitwell
435eff8b85 i915 will use _TexEnvProgram (if active) 2005-05-09 17:59:13 +00:00
Keith Whitwell
276330b241 Use driver functions to create TexEnvProgram, TnlProgram 2005-05-09 17:58:13 +00:00
Keith Whitwell
ff6723e326 check for null DrawBuffer values 2005-05-09 17:42:18 +00:00
Keith Whitwell
1180fc13db Fallback (rather than fail) on unknown program targets. 2005-05-09 17:38:52 +00:00
Jon Smirl
5c6aec2f39 dri fb works using renderbuffers now in RGBA mode 2005-05-08 05:01:03 +00:00
Jon Smirl
86300c6945 fbdri can draw double buffered now. Next step is to convert it
to use RenderBuffers.
2005-05-07 19:56:44 +00:00
Brian Paul
fc3bc1ae14 remove some dead code 2005-05-07 18:27:58 +00:00
Brian Paul
d3bd97bb14 x86_64 stuff 2005-05-07 17:27:57 +00:00
Brian Paul
52064f6c37 added linux-x86-xcb config (Jeremy Kolb) 2005-05-07 17:21:11 +00:00
Brian Paul
2eb147e7f5 Patches for XCB (Jeremy Kolb) 2005-05-07 17:14:50 +00:00
Brian Paul
6f3d16c64a assorted warning clean-ups for x86_64, etc (Mikko T.) 2005-05-07 17:06:49 +00:00
Brian Paul
42fa81275c x86-64 transform optimizations (Mikko T.) 2005-05-07 16:59:58 +00:00
Brian Paul
e3f684b753 fix a bunch of html errors 2005-05-06 22:17:24 +00:00
Brian Paul
883d20791a fix cpp / bytesPerPixel problem (bug 1196554) 2005-05-06 19:28:31 +00:00
Brian Paul
b1d0ac64ab remove bad assertion, added new ones in clear_pixmap() 2005-05-06 15:23:54 +00:00
Brian Paul
c64573997c restore call to SetBuffer() in clear_color_buffers(), only temporary 2005-05-06 14:44:16 +00:00
Ben Skeggs
e133984f51 Updated for EXT_framebuffer_object changes. I don't know if this is correct, but it seems to work 2005-05-06 08:41:50 +00:00
Jon Smirl
bd8162aaac Fix problem generating mode db. Miniglxtest works now.
Miniglxsample is still broken with double buffering issues.
2005-05-06 05:50:41 +00:00
Aapo Tahkola
4a55d4ffa7 Missing setups that cause all kinds of problems with hw tnl. 2005-05-06 03:18:40 +00:00
Karl Schultz
6258b76c49 Port Mesa to build on a P64 platform (e.g., Win64). P64 platforms
use 64-bit pointers and 32-bit longs.  So, operations like casting pointers
to unsigned long and back to pointer won't work.  glheader.h now
includes files to define uintptr_t, which should instead be used for
this sort of operation.  It is an integer type that is the same size
as a pointer.
2005-05-05 21:08:07 +00:00
Brian Paul
203dcb733d fix for renderbuffer (Andreas Stenglein) 2005-05-05 17:13:18 +00:00
Brian Paul
bd1d9d96b2 remove some test code 2005-05-05 15:09:16 +00:00
Brian Paul
9f8b3fac97 minor face-lift for web pages 2005-05-05 14:18:31 +00:00
Brian Paul
0355d3ff94 fix typo 2005-05-05 14:18:04 +00:00
Brian Paul
cb34c11663 added a comment 2005-05-05 13:08:06 +00:00
Brian Paul
1077779c7d add PROGRAM_DIRS line 2005-05-05 13:07:52 +00:00
Aapo Tahkola
1c39d183c4 Getting rusty... 4278 was already there. 2005-05-05 06:51:00 +00:00
Jon Smirl
fd4f7064e2 Fix up origin in dri/fb driver
Calculated fbBPP
2005-05-05 05:50:19 +00:00
Aapo Tahkola
db46e2a7dd Flat shading and bunch of clarifications to r300_reg.h . 2005-05-05 03:40:47 +00:00
Adam Jackson
e7769cb348 Refactor COMMON_SOURCES up to Makefile.template 2005-05-05 03:15:08 +00:00
Jon Smirl
d83c4e6dd1 Minor touchups to fbdev renderbuffer support 2005-05-05 00:28:37 +00:00
Aapo Tahkola
73e8ffe9f3 Pack tex coord regs at vertex program backend. 2005-05-05 00:28:31 +00:00
Brian Paul
286c4cc201 more updates for users of s_spantemp.h 2005-05-05 00:10:18 +00:00
Adam Jackson
b3e878ad90 Add drirenderbuffer.c to COMMON_SOURCES 2005-05-04 22:05:02 +00:00
Brian Paul
eae0439ae6 fix s_spantemp.h includes 2005-05-04 20:20:02 +00:00
Brian Paul
79c0bb5264 FBO changes 2005-05-04 20:18:23 +00:00
Brian Paul
41a93f544e fix xm_span2.c reference 2005-05-04 20:13:59 +00:00
Brian Paul
e4b2356c07 Major check-in of changes for GL_EXT_framebuffer_object extension.
Main driver impacts:
- new code for creating the Mesa GLframebuffer
- new span/pixel read/write code
Some drivers not yet updated/tested.
2005-05-04 20:11:35 +00:00
Brian Paul
ebef61f5c0 html fix 2005-05-04 20:05:21 +00:00
Brian Paul
fe6ee3f5e6 EGLScreenMESA updates 2005-05-04 20:00:15 +00:00
Brian Paul
f5581bb994 don't call XTranslateCoordinates() if rendering to pixmap 2005-05-04 14:50:45 +00:00
Keith Whitwell
47b29f511a Add a facility to route all rasterization through a fragment program
which is automatically generated to match the current texture environment
state.  Introduces a new value ctx->FragmentProgram._Active which is
true when either _Enabled is true or there is such a fragment program
ready to run.

To test out on a driver running the software rasterizer, set
MESA_TEX_PROG=t in the environment.  It goes without saying that performance
is lower for the software rasterizer in this mode.
2005-05-04 11:44:44 +00:00
Keith Whitwell
c3f764f7bb Sort instructions for clarity. 2005-05-04 11:21:46 +00:00
Keith Whitwell
3151b27b0a Include negate information in disassembly output. 2005-05-04 11:21:25 +00:00
Keith Whitwell
209b090241 Mark unused registers as undefined so dissassemblers can recognized
them easily.
2005-05-04 11:20:59 +00:00
Keith Whitwell
d8f9599403 Improve the quality of the disassembly output for fragment programs. 2005-05-04 11:20:20 +00:00
Jouk Jansen
c6e1569b7f Committing in .
OpenVMS compile update

 Modified Files:
 	Mesa/src/mesa/shader/slang/descrip.mms
 ----------------------------------------------------------------------
2005-05-04 06:33:58 +00:00
Jon Smirl
82761cb08b DRI fbdev driver getting better. Now I can see something on the screen
but it isn't the right something yet.
2005-05-04 06:12:22 +00:00
Brian Paul
c22990c29a sync with latest EGL_MESA_screen_surface spec (EGLScreenMESA handles) 2005-05-04 03:33:21 +00:00
Brian Paul
3aeae20685 updates for latest EGLScreenMESA changes 2005-05-04 03:32:39 +00:00
Keith Whitwell
884b5ade86 Import all texture coordinate arrays. Import them only once. 2005-05-03 15:11:23 +00:00
Aapo Tahkola
138b7ef4d9 Add support to external tnl switcher and disable hw tnl by default. 2005-05-01 23:36:43 +00:00
Felix Kuehling
3a934557bf Bumped the Savage driver date (a bit late) to mark S3TC support. 2005-05-01 14:37:23 +00:00
Felix Kuehling
5f0bf77255 Fixed and cleaned up programming of watermark registers. There may be
a marginal speedup, but I'm not sure this has the same effect on all
hardware. Tested on Savage IX and ProSavageDDR. For experimenting with
different values see the macros at the start of savagestate.c.
2005-05-01 14:29:16 +00:00
Jon Smirl
8af7ff1ded Improve the DRI fb driver, now it compiles.
Added code to support NEW_INTERFACE.
It still doesn't work. Made it build from make linux-solo.
2005-05-01 00:21:27 +00:00
Brian Paul
1c54579e86 apply previous GL_COMPRESSED_TEXTURE_FORMATS_ARB fix to generator file, and regenerate get.c 2005-04-30 18:30:16 +00:00
Aapo Tahkola
7d33053e47 r300 side support for fixed function pipeline. This isnt functional with current Mesa. 2005-04-30 11:06:14 +00:00
Felix Kuehling
47d18cbb64 Fixed bogus ENUM_TO_BOOLEAN in
_mesa_GetIntegerv(GL_COMPRESSED_TEXTURE_FORMATS_ARB). Must be ENUM_TO_INT.
mesa/progs/tests/texenv now lists supported compressed texture formats
correctly.
2005-04-30 02:09:23 +00:00
Felix Kuehling
f1d053b19a Added S3TC support to the Savage driver with some help from Mark Cass's
S3TC support for an older driver version. On Savage3D/IX/MX
GL_EXT_texture_compression_s3tc can't be enabled because DXT3 and DXT5
are not supported. However GL_S3_s3tc is enabled on all Savage chips.
Tested on a Savage IX and a ProSavageDDR
2005-04-30 02:03:18 +00:00
Jon Smirl
28d0a9c9dd Fix include path to make build work 2005-04-29 22:25:21 +00:00
Keith Whitwell
5f534aa1e2 Format for 80 columns. Add alternate matrix mul based on MAD rather than DP4. 2005-04-29 17:32:27 +00:00
Keith Whitwell
e9e20fc47d Add DISASSEM define, similar to other program generator files. 2005-04-29 17:31:54 +00:00
Keith Whitwell
a5cb1aa211 Add linux-fbdev config 2005-04-29 17:31:10 +00:00
Keith Whitwell
431417fec7 new config 2005-04-29 17:30:29 +00:00
Keith Whitwell
5c81a4b9cd Put back not-so-redundant #ifdef. 2005-04-29 15:41:24 +00:00
Keith Whitwell
a6ebcdfe7d Remove redundant #ifdef, fix compiler warning 2005-04-29 15:37:27 +00:00
Keith Whitwell
2c19069182 new file 2005-04-29 15:36:38 +00:00
Keith Whitwell
15e75e00c7 Maintain a fragment program for current texturing state. 2005-04-29 15:11:39 +00:00
Brian Paul
d59054e60b fix _tnl_copy_to_current() so that current edge flag and rasterpos aren't trashed by color index updates 2005-04-28 21:14:00 +00:00
Keith Whitwell
5cef1a1fed Stop gcc-4.0 complaining about "type qualifiers ignored on function
return type".
2005-04-28 13:16:23 +00:00
Keith Whitwell
545515cbea Stop gcc-4.0 complaining about "type qualifiers ignored on function
return type".
2005-04-28 12:05:58 +00:00
Brian Paul
97e1e60b1c move set_component_sizes() to fix bug 3135 2005-04-27 21:20:30 +00:00
Brian Paul
69441868f6 no need to enable fog or set fog mode with fragment program 2005-04-26 20:58:27 +00:00
Brian Paul
55d8dd4078 tweak previous fog/fragment program fix 2005-04-26 20:56:21 +00:00
Brian Paul
d09df24082 added interpolate_fog() 2005-04-26 17:35:45 +00:00
Brian Paul
c03b6f40ba enable fog render input if fragment program fog option set 2005-04-26 17:25:53 +00:00
Brian Paul
c039af165d comments and minor clean-up 2005-04-26 16:02:56 +00:00
Aapo Tahkola
c3259fa436 Fix as suggested by Ben Skeggs. 2005-04-25 09:50:45 +00:00
Keith Whitwell
b83aadb0e4 Ensure all VB->AttribPtr[] are populated. Reported by Aapo Tahkola 2005-04-25 09:36:27 +00:00
Jon Smirl
576caad33e Minor changes to make linux-solo build again 2005-04-25 03:03:10 +00:00
Felix Kuehling
cbc8d7596a Software fallback for glColorMask. Can be avoided on Savage4 when all
channels are masked (disable draw update). Bumped driver date to
reflect recent correctness fixes. The driver now passes all glean
tests except exactRGBA on both Savage4 and Savage3D-based cards.
2005-04-24 20:55:57 +00:00
Aapo Tahkola
6ffd0a4cf1 Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore. 2005-04-24 09:08:31 +00:00
Felix Kuehling
5c906924ed Fixed a segfault introduced by Keith's pipeline changes. 2005-04-23 19:54:30 +00:00
Felix Kuehling
9b4536a654 Texturing fixes for Savage3D/MX/IX:
- force emitting texAddr when the texture image changed (flush caches)
- set transparent texture color key to something improbable
  (couldn't find a way to disable it completely)
- fixed texture environment modes GL_DECAL and GL_REPLACE
- made texture environment mode GL_BLEND a software fallback
- added two custom texture formats for promoting from GL_ALPHA to ARGB8888
  and 4444. Since the hardware can't be made to ignore the RGB color
  components, set them to 1 instead of 0. This gives the correct results
- disabled GL_EXT_texture_env_add on Savage3D/MX/IX
- map both GL_CLAMP and GL_CLAMP_TO_EDGE to hardware mode "wrap". It doesn't
  match either mode exactly by the spec, so we should either fall back on both
  or none. I chose the latter.
- fall back to software when s and t wrapping modes differ (hardware has only
  one bit for both)
2005-04-23 17:18:57 +00:00
Keith Whitwell
df943a4041 Fix the worst problems with dangling edgeflag references in
display lists.  These mainly arise from edgeflag being the only
attribute no longer stored internally as a float and requiring
various special case paths to accomodate it.
2005-04-23 11:55:18 +00:00
Keith Whitwell
0d4af83f25 Updates for pipeline_stage struct changes. 2005-04-22 22:47:09 +00:00
Keith Whitwell
bf87f86493 First pass at updating these drivers with pipeline_stage struct changes. 2005-04-22 22:42:09 +00:00
Felix Kuehling
963586b871 Added a French translation of option descriptions by Stephane Marchesin. 2005-04-22 21:36:37 +00:00
Brian Paul
fc06f9fb25 demo / test progs 2005-04-22 21:17:14 +00:00
Brian Paul
20d44dc9bc types for Mesa implementation of EGL 2005-04-22 21:16:28 +00:00
Brian Paul
11b0a76370 prototype EGL_MESA_screen_surface. 2005-04-22 21:16:12 +00:00
Brian Paul
adbff7e977 initial EGL code 2005-04-22 21:09:39 +00:00
Keith Whitwell
a661654a33 Move the call to _tnl_UpdateFixedFunctionProgram to make
it easier for hardware drivers to test this out.
2005-04-22 13:02:04 +00:00
Keith Whitwell
6f973f3367 Simplify the pipeline_stage structure
- remove input/output fields, input tracking removed.
	- remove state fields, the validate function now called
	  on every statechange.
	- add an explicit 'create' function.

Add in code to build vertex program to implement current t&l state.  Still
disabled, but turn on with a #define in t_vp_build.h.
2005-04-22 12:51:19 +00:00
Keith Whitwell
6a13c7da4c Up the value of MAX_NV_VERTEX_PROGRAM_PARAMS to a power of two. 2005-04-22 12:46:13 +00:00
Michal Krol
addcc6afbd Add more error checking. 2005-04-22 10:43:36 +00:00
Michal Krol
19fb77ee7b Cosmetic changes. 2005-04-22 10:28:53 +00:00
Michal Krol
b10d080b1e Move some utility functions to slang_utility.c. 2005-04-22 10:15:32 +00:00
Michal Krol
3ed1f07686 Provide precompiled binary versions of built-in library .gc sources
to dramatically improve shader compiling performance.
2005-04-22 09:51:46 +00:00
Brian Paul
2cbbd3dc50 undef DEPTH_TYPE at end 2005-04-22 02:56:21 +00:00
Felix Kuehling
a7fcac5e92 Fixed some suspicious pointer casts that caused lots of
compile-time-warnings on x86-64. Not tested on x86-64 yet, but a good
thing in general, so I'm giving up waiting for feedback. See also
https://bugs.freedesktop.org/show_bug.cgi?id=2924.
2005-04-21 21:50:54 +00:00
Felix Kuehling
07d91bbb59 Fixed TexEnv modes GL_BLEND and GL_ADD on Savage4-based cards. Disabled
the use of hardware texture format I8 as it produces garbage at least on
ProSavageDDR.
2005-04-21 21:43:21 +00:00
Aapo Tahkola
b3474de7b5 Adding some comments. 2005-04-21 19:09:54 +00:00
Keith Whitwell
7c26b61f93 Reduce the size of mesa's internal fragment and vertex program
representations by switching to packed structures for registers and
instructions.
2005-04-21 14:46:57 +00:00
Brian Paul
88b69d7998 use _mesa_pow() for LIT (bug 3087) 2005-04-21 14:19:50 +00:00
Keith Whitwell
f069e5e412 Facility to construct a vertex program which executes the current
fixed function t&l pipeline.

Currently runs most of the Mesa demos OK, but still needs debugging &
polishing.
2005-04-21 13:13:49 +00:00
Keith Whitwell
0ff98b03c6 New software implementation of ARB_vertex_program. Similar in speed
to existing version, but with the potential for good improvements.
2005-04-21 13:11:02 +00:00
Aapo Tahkola
70375aff48 Had some odd problems with add and temps so doing it with mad. Adding some MAD_2 cases. 2005-04-21 05:24:02 +00:00
Brian Paul
52bf005425 fix state.light[n].spot.direction.w value (bug 3083) 2005-04-20 23:47:03 +00:00
Brian Paul
8d51bbf2a3 clean up buffer creation code 2005-04-20 17:12:10 +00:00
Aapo Tahkola
fc8f202181 Reorganized shader stuff. 2005-04-19 18:49:44 +00:00
Aapo Tahkola
c4e1fd5a7f Fixes for bugs that were nailed down when compairing against software vertex shading. 2005-04-19 03:12:30 +00:00
Aapo Tahkola
f8ed0aa268 Fixing and enabling elt buffers by default. 2005-04-18 22:41:43 +00:00
Ian Romanick
d03ab104db If the file name passed to parse_GL_API is None or "-", read from standard
input.  This allows use of GL API scripts in pipelines.
2005-04-18 21:30:20 +00:00
Ian Romanick
93d2d54e7a Refactor a bunch of common code from the "leaf" scripts to a new functions,
parse_GL_API, in gl_XML.py.
2005-04-18 19:42:23 +00:00
Ian Romanick
8ea22650bd Fill-in function offsets and correct a couple typos. 2005-04-18 19:17:12 +00:00
Ian Romanick
2510ba618d Convert all Python scripts to use XML namespaces. 2005-04-18 19:16:07 +00:00
Peter Zubaj
b7142567bc Alpha test fix 2005-04-18 19:06:14 +00:00
Ian Romanick
61f08d8094 Move the DTD to its own file. 2005-04-18 18:36:57 +00:00
Brian Paul
f905145b60 comments and clean-up 2005-04-18 17:48:25 +00:00
Ian Romanick
02986cb2cc Add support for pthreads and TLS to libGL for __glXLock / __glXUnlock and
for tracking the current GLX context.

This fixes bug #3024.
2005-04-18 16:59:53 +00:00
Ian Romanick
2e823f29e4 Send GL_PACK_INVERT_MESA state to the server. This fixes bug #2538. 2005-04-18 16:40:36 +00:00
Brian Paul
b52673117b s/NORMAL/FOG/ (J.P. Delport) 2005-04-18 14:21:44 +00:00
Jouk Jansen
49b1d95c1c Updates for OpenVMS : New makefiles
added some type-casts

 Modified Files:
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/shader/program.c
 	Mesa/src/mesa/shader/slang/slang_compile.c
 	Mesa/src/mesa/shader/slang/slang_preprocess.c
 Added Files:
 	Mesa/src/mesa/shader/slang/descrip.mms
 ----------------------------------------------------------------------
2005-04-18 13:05:24 +00:00
Brian Paul
e9a3d8a772 added SLANG_SOURCES to SOLO_C_SOURCES 2005-04-15 22:20:46 +00:00
Brian Paul
afb3fb4b77 config for profiling with gprof 2005-04-15 22:16:18 +00:00
Brian Paul
635ee2df37 added _mesa_share_state() 2005-04-15 17:25:07 +00:00
Ben Crossman
509710cfd7 more gldirect compile fixes. Getting near the linking stage now. No build file yet. 2005-04-15 17:17:47 +00:00
Brian Paul
efb41b07ff remove carriage returns 2005-04-15 16:05:14 +00:00
Keith Whitwell
78803b2667 Fix alpha value of STATE_LIGHTMODEL_SCENECOLOR. From the spec:
The "w" component of the program parameter variable is filled with
 the alpha component of the front diffuse material color.

Make sure matrix inverses are uptodate also.
2005-04-15 12:57:23 +00:00
Michal Krol
a131d50fb7 add shader/slang/slang_preprocess.c 2005-04-15 10:30:43 +00:00
Michal Krol
e3a846b0e3 implement info log; parse #version directive 2005-04-15 10:23:10 +00:00
Michal Krol
65ce50897e slang preprocessor 2005-04-15 10:21:34 +00:00
Michal Krol
8855664489 slang #version directive syntax 2005-04-15 10:20:30 +00:00
Michal Krol
35725a92be change __asm statement semantics 2005-04-15 10:19:27 +00:00
Ben Crossman
d8aa5ffed5 Reverted the last change back to fix bug 3035 2005-04-15 09:13:21 +00:00
Ian Romanick
067e788acd Convert 'variable_param' from a CDATA attribute to a NMTOKENS attribute.
The main difference is that white-space is used to separate the names
instead of comas.
2005-04-14 23:03:44 +00:00
Ian Romanick
73b4c1b388 Refactor the handling of the '(true | false)' enumerated attributes. 2005-04-14 23:00:34 +00:00
Ian Romanick
a3deff2404 Modify the DTD to use NMTOKEN, enumerants, and explicit default values
wherever possible.  Correct a couple mis-uses of the 'counter' attribute
when 'count' was intended.  Fix some errors in the DTD and in the data with
'doubles_in_order'.
2005-04-14 22:59:46 +00:00
Ian Romanick
6cae4f3bc9 In GLX_USE_TLS builds, make GET_CURRENT_CONTEXT use the TLS verion of the
variable.  Without this, GET_CURRENT_CONTEXT would *always* result in a call
to _glapi_get_context (because _glapi_Context is a const pointer to NULL in
TLS builds).
2005-04-14 21:05:55 +00:00
Ian Romanick
f434e07a6a Add missing includes of indirect.h. 2005-04-14 20:35:33 +00:00
Ben Crossman
369404299c A few getenv() that werent using the mesa wrapper version 2005-04-14 19:54:15 +00:00
Ben Crossman
b2b01a60db Some initial compile fixes. Still some left and warnings that need fixing. No where near runnable yet. 2005-04-14 16:58:25 +00:00
Keith Whitwell
60e2810ae4 Disable CLOD (Lod constant) state emit. The values emitted were
possibly negative, hence clobbering the leading register-id byte.
Fixed the calculation of the values to prevent negative numbers being
emitted, but the code still doesn't implement texture LOD bias
correctly, so leave it disabled overall.
2005-04-14 15:53:30 +00:00
Michal Krol
99b329ca13 hook to _slang_compile() 2005-04-14 10:31:36 +00:00
Michal Krol
ed5f790919 cosmetic changes 2005-04-14 10:30:08 +00:00
Michal Krol
8c01903114 ARB_fragment_shader state 2005-04-14 10:28:14 +00:00
Michal Krol
6372ea0da0 ARB_fragment/vertex_shader state 2005-04-14 10:27:19 +00:00
Michal Krol
2a37053fd5 ARB_shading_language_100 bit;
Fragment shader derivative hint
2005-04-14 10:25:49 +00:00
Michal Krol
1e8fc5ffea add GL_ARB_shading_language_100;
reorder GL_ARB_shader_objects and GL_ARB_fragment/vertex_shader stuff
2005-04-14 10:23:51 +00:00
Michal Krol
5c968cbc5e add FEATURE_ARB_shading_language_100;
remove FEATURE_shading_language;
add ARB_fragment/vertex_shader max values
2005-04-14 10:21:30 +00:00
Michal Krol
98e35025ba do not use isdigit() - can cause link errors 2005-04-14 10:19:19 +00:00
Brian Paul
fd451b6d01 updated procedure for getting CVS-write access 2005-04-13 23:50:47 +00:00
Ian Romanick
25fe93f0a1 Add TLS support to libGL and, by virtue of using glthread.h and GL_CALL, all
DRI drivers.  A TLS enabled libGL can load a TLS or a non-TLS DRI driver,
but a TLS DRI driver requires a TLS enabled libGL.

This fixes bug #1822.
2005-04-13 20:59:15 +00:00
Ian Romanick
c604e457d1 Revert revision 1.13. This allows server-side libGLcore (in X.org) to build
with Mesa CVS.  This change was wrong in the first place, and the issue that
necessitated it has been resolved.  For more background on the problem see:

http://marc.theaimsgroup.com/?l=mesa3d-dev&m=111333880529935&w=2
2005-04-13 18:41:33 +00:00
Michal Krol
9a5ba4794c add SLANG_SOURCES 2005-04-13 14:05:28 +00:00
Michal Krol
fa2802d4d0 clean-up stuff 2005-04-13 14:05:06 +00:00
Michal Krol
0e7836b500 simple front-end compiler 2005-04-13 14:04:41 +00:00
Michal Krol
d3ea221d3e add __fixed_input and __fixed_output qualifier support;
fix for_init_statement output;
2005-04-13 13:18:35 +00:00
Michal Krol
2f951683be cosmetic changes;
add __fixed_input and __fixed_output qualifiers for built-in variables;
2005-04-13 13:06:57 +00:00
Michal Krol
5a38200122 cosmetic changes;
fix syntax errors;
2005-04-13 13:03:23 +00:00
Michal Krol
f18d70b804 cosmetic changes;
change first parameter's qualifier from inout to out for __operator =;
remove __asm instructions: int_add, int_multiply, int_divide, int_negate,
int_less, int_equal, bool_equal;
2005-04-13 12:59:58 +00:00
Michal Krol
cfcf86b37d converts a .gc file to a C header containing string form of the file 2005-04-13 12:48:40 +00:00
Felix Kuehling
0ad2ef20a7 Added a Spanish translation by David Rubio Miguélezand a Dutch
translation by Manfred Stienstra.
2005-04-12 21:01:30 +00:00
Felix Kuehling
ad0dbe6b04 Changed escaping of double quotes. 2005-04-12 20:58:34 +00:00
Brian Paul
41bddcfa7b PF_8A8R8G8B pixel format (Dave Reveman) 2005-04-12 01:41:04 +00:00
Felix Kuehling
55ba0dccc9 Manage option translations in separate .po files to make translations
easier for non-programmers familiar with GNU gettext. For now there is
only a German translation but more translations are encouraged.

Translatable strings are extracted from t_options.h containing option
definitions with English descriptions. A corresponding header options.h
with all available translations of option descriptions is generated by
gen_xmlpool.py and included by xmlpool.h.

Many option descriptions were rephrased to make them unambiguous for
translation without context. They are hopefully more helpful to users at
the same time.
2005-04-11 21:41:40 +00:00
Brian Paul
aaa5a66433 set table size to 1023 and use new HASH_FUNC() macro 2005-04-10 17:44:27 +00:00
Adam Jackson
5f92c38f0e Bug #2945: Fix math error that left half the hash buckets empty. 2005-04-09 18:35:57 +00:00
Ian Romanick
db382c5b1d Remove all the radeon_subset files. They were completely unused. Keith
Whitwell says, "[T]he radeon subset code can probably be archived now."
This "fixes" bug #1623.
2005-04-08 23:54:20 +00:00
Ian Romanick
a657c1aee8 Use the same dispatch.c source file for "normal" Mesa builds and DRI
libGL builds.
2005-04-07 23:58:51 +00:00
Brian Paul
d9c389dff6 Add shaderobjects_3dlabs.c back into build but use #ifdef FEATURE_shading_language to enable/disable relevant code. 2005-04-07 14:38:41 +00:00
Ian Romanick
c51ed8c236 Follow the GLX_SGIX_fbconfig spec and return the complete list of
available fbconfigs if attrList is NULL.  This fixes bug #2917.
2005-04-07 00:05:55 +00:00
Brian Paul
c61782958b added wrappers/helpers for creating/destroying rendering contexts 2005-04-06 22:41:46 +00:00
Brian Paul
c3984fc015 changed implementation of GetAllFBConfigs() 2005-04-06 22:40:39 +00:00
Brian Paul
481bdd383a Fix Fake_glXChooseFBConfig so passing NULL attribList causes a list of all
fbconfigs to be returned.
2005-04-06 22:33:15 +00:00
Ian Romanick
bfc8a8dc63 Make linux-dri-x86-64 more like linux-dri-x86. Add ARCH_FLAGS. This is
where things like "-m64" or "-m32" should be specified.  Using this, a
32-bit DRI build can be done on an x86-64 system by doing 'ARCH_CFLAGS=-m32
make linux-dri-x86'.  Minor tweaks to linux-dri to support these changes.
2005-04-06 21:34:34 +00:00
Ian Romanick
29c909f81c Make glxgears_fbconfig compile and respect the DISPLAY setting. Add it
to the Makefile as well.
2005-04-05 20:43:06 +00:00
Keith Whitwell
5234d17514 Don't call PrimitiveNotify with an invalid primitive. Fix ipers
wireframe mode.
2005-04-05 10:30:05 +00:00
Brian Paul
c39a4bc83c s/Togle/Toggle/ 2005-04-04 20:06:40 +00:00
Brian Paul
a92100a3c6 updated warning string to match patch in bug report 2868 2005-04-04 16:06:16 +00:00
Brian Paul
fe1230f1c8 Use FEATURE_shading_language to control whether the shading language
compiler is hooked in.  May be enabled on compiler command line by setting
-DFEATURE_shading_lanuage=1.
2005-04-01 01:41:54 +00:00
Adam Jackson
26772ac988 Disable _mesa_3dlabs_create_{program,shader}_object references. 2005-03-30 17:02:18 +00:00
Brian Paul
425569bbc5 Disable C++ shading language code yet again. Doesn't compile with older
g++ installations.
2005-03-29 02:46:59 +00:00
Brian Paul
93b52d9484 re-enable shading language sources 2005-03-29 02:31:43 +00:00
Brian Paul
1706ba4101 re-enable _mesa_init_shaderobjects_3dlabs() call 2005-03-29 02:31:11 +00:00
Brian Paul
9a54843a94 fix a variety of warnings/errors 2005-03-29 02:28:21 +00:00
Brian Paul
cb80e3905c disable 3dlabs shading language code until build is fixed 2005-03-26 19:45:40 +00:00
Brian Paul
32e845f05e disable _mesa_init_shaderobjects_3dlabs() call until build is fixed 2005-03-26 19:45:08 +00:00
Brian Paul
7d4abc9b3a remove INSTALL.GNU from tarball list 2005-03-26 19:22:06 +00:00
Brian Paul
a62fe7f5e3 obsolete 2005-03-26 19:21:07 +00:00
Michal Krol
00e599e783 implement gl2_3dlabs_shhandle interface; resolve few TODOs 2005-03-25 12:16:53 +00:00
Michal Krol
1d7f71924d cleanup query functions 2005-03-25 12:12:50 +00:00
Michal Krol
05ab19ef43 add _mesa_init_shaderobjects_3dlabs() declaration 2005-03-25 12:07:31 +00:00
Michal Krol
a095aa4f4b fix comments; fix TBuiltInResource typedef 2005-03-25 12:05:30 +00:00
Michal Krol
675f802542 fix comments; disable DLL linkage for WIN32 2005-03-25 12:03:58 +00:00
Felix Kuehling
116986bad5 Fixed segfault due to an off-by-one error in SAVAGE_TEX_MAXLEVELS. 2005-03-24 11:53:19 +00:00
Felix Kuehling
798e753e07 Initialize texture addresses to something valid. 2005-03-23 17:59:09 +00:00
Keith Whitwell
ce1d7ee5ee remove file after merge 2005-03-23 12:01:08 +00:00
Brian Paul
068039eec1 no change 2005-03-23 03:34:24 +00:00
Brian Paul
05bbafa01a use $(*_LIB) in the *_LIB_NAME definitions 2005-03-23 02:12:21 +00:00
Keith Whitwell
8fb17f5b3f rename mesaVis to try and improve clarity 2005-03-22 14:30:30 +00:00
Keith Whitwell
3e62d3a8d8 add FreeTexImageData hook to help single-copy texturing in drivers 2005-03-22 14:27:10 +00:00
Keith Whitwell
050b77a9ac merge unichrome changes from branch 2005-03-22 14:25:55 +00:00
Keith Whitwell
59b4b7e07e Remove test for defined(DRM_USE_MALLOC) around definition of
drmSIGIOHandler().
2005-03-22 13:34:27 +00:00
Keith Whitwell
46d50d9e8e Add more formats to test. 2005-03-22 13:32:35 +00:00
Keith Whitwell
de4fe1e3c5 Add DRM_USE_MALLOC flag 2005-03-22 13:31:35 +00:00
Keith Whitwell
7f8e10f96c Calculate haveAccumBuffer, haveDepthBuffer and haveStencilBuffer in
driFillInModes().
2005-03-22 13:16:20 +00:00
Michel Dänzer
e7c7a0f353 Add support for production version of ATI RN50/ES1000. (ATI Technologies
Inc.)
2005-03-18 23:05:07 +00:00
Aapo Tahkola
6bd390743d Misc fixes. 2005-03-18 14:44:27 +00:00
Michal Krol
2fb2e27e28 update against 03-Feb-2005 release 2005-03-18 14:28:02 +00:00
Michal Krol
5b641a516e enable all 3dlabs front-end compiler sources 2005-03-18 14:21:07 +00:00
Michal Krol
706bb1c714 a little program to change // comments to /* */ ones 2005-03-18 14:07:47 +00:00
Michal Krol
1d5c727bba glslang flex and bison sources:
flex glslang.l
bison -t -v -d glslang.y
mv glslang.tab.c Gen_glslang_tab.cpp (shouldn't be .c?)
mv glslang.tab.h glslang_tab.h
2005-03-18 12:18:00 +00:00
Aapo Tahkola
a890ceee63 Fix to get doom3 started. 2005-03-17 22:28:06 +00:00
Ian Romanick
8a7dcd97bd xmllint fixes. Revert 'note_unflushed' changes that were accidetnally
committed in the last version.
2005-03-17 22:01:39 +00:00
Aapo Tahkola
a78bbd0816 Simple TCL stage and ability to disable vps. 2005-03-17 21:50:01 +00:00
Ian Romanick
80a939cafb Enable the generation of server-side __glGetBooleanv_size and related
functions.  There are two parts to this.  First, a size element with a name
"Get" is shorthand for having four separate size elements with names
"GetIntegerv", "GetDoublev", "GetFloatv", and "GetBooleanv".  Additionally,
a count of "?" is treated specially.  This causes a call to a handcoded
function named "__gl<base name>_variable_size".  This is *only* needed to
support GL_COMPRESSED_TEXTURE_FORMATS.  That enum can return a variable
number of values depending how many compressed texture formats are supported
by the implementation.

Fix a problem with glGetProgram{Local,Env}Parameter[df]vARB,
glAreProgramsResidentNV, and glGetVertexAttribivNV.  These changes only
affect code generated for the server-side.

The changes to enum.c are caused by enums added for the server-side
__glGetBooleanv_size functions.
2005-03-17 21:48:37 +00:00
Ian Romanick
6af6a69312 Minor refactoring and code tweaking. The only notable chage is that
FilterGLAPISpecBase::xref is replaced by
FilterGLAPISpecBase::functions_by_name.  The notable difference between the
two is that ::functions_by_name includes all functions, whether they have an
assigned offset or not.  This feature will be useful (necessary) when more
server-side code is generated.
2005-03-17 20:56:13 +00:00
Ian Romanick
979f35fb78 Minor vertex array support tweaks. These are in preparation for the
(eventual) addition of support for ARB_vertex_buffer_object.  Elminitate the
need for array_state_vector::large_header.  Make some very minor tweaks to
the handling of the indices pointer in emit_DrawElements_old.
2005-03-17 20:36:20 +00:00
Ian Romanick
b81efaaa1a Minor vertex array support tweaks. Most of these are in preparation for the
(eventual) addition of support for ARB_vertex_buffer_object.

Move all the private vertex array data structures out of
indirect_vertex_array.c and into indirect_va_private.h.

Rename array_state_vector::enabled_array_count to
array_state_vector::enabled_client_array_count.

Make sure that both the GL extension string and the server GL version are
available when __glXInitVertexState is called.

Make sure that array_state::normalized is set correctly in the array's
gl*Pointer function.
2005-03-17 20:13:09 +00:00
Ian Romanick
00e760c971 Refactored some of the code for PrintGlxReqSize_[ch]. This ensures that the
same set of functions will be iterated for both the generated C-source file
and the generated header file.
2005-03-17 01:50:32 +00:00
Ian Romanick
3f35fbbf66 Fix the handling of zero-sized output parameters (i.e., those with type
'GLvoid *').  This fixes the GLX protocol for glGetProgramStringARB.  This
fixes bugzilla #2747.

Remove the 'ignore="true"' from glVertexAttrib4bvARB.  This fixes bugzilla
#2746.
2005-03-17 01:48:11 +00:00
Ian Romanick
9eae0b9f19 Hard-code the client-side maximum GL version. It turns out that there are
some flaws in the calculation code when the highest version listed in
known_gl_extensions is supported.  This code would also have some problems
with some of the new features (that don't have an associated extension) on
GL 2.0.
2005-03-17 01:36:24 +00:00
Aapo Tahkola
c1aa3d1e6f Proper VAP output configuration as R300_RS_ROUTE_0_COLOR became optional and broke arbvptorus(takes no input color but produces output color). Also removing some useless code. 2005-03-16 22:32:48 +00:00
Ben Skeggs
dd9da8cdb5 Fixed some strangeness when mixing textured/flat primitives. Skipping texture units should render correctly also. Aapo, I dont think I broke glxgears again on you... 2005-03-16 00:54:09 +00:00
Roland Scheidegger
fbe5296d14 add support for user-configurable brilinear filtering on r200 2005-03-15 22:23:29 +00:00
Aapo Tahkola
7541794373 Fix to get glxgears display anything. 2005-03-15 20:55:29 +00:00
Ben Skeggs
3c4c86aff2 For some reason the Makefile didn't commit.. 2005-03-15 17:09:35 +00:00
Ben Skeggs
34dd4843d7 Initial multitexturing support. Old behaviour can be re-enabled by changing ifdefs in r300_setup_rs_unit and r300SetupPixelShader in r300_state.c\nRequires DRM update. 2005-03-15 17:00:44 +00:00
Ian Romanick
7457a648d2 If setting GL_PACK_INVERT_MESA results in a GL error, log it. 2005-03-14 22:09:31 +00:00
Felix Kuehling
bd5bba8470 When timestamping textures, need to emit the event with SAVAGE_WAIT_3D
set. Otherwise the 3D engine may still be using a texture that is
being overwritten. In order to minimize the cost of waiting, timestamp
textures only when needed: when a texture image changes, when a
different texture is bound to a texture unit or when a texture unit is
disabled. (Used to be after flushing every command buffer.)
2005-03-14 21:52:46 +00:00
Peter Zubaj
e2e4a5c992 Stencil support
Reflex from mesa demos doesn't work
TODO - double side stencil
I hope that I didn't break anything
2005-03-14 20:35:00 +00:00
Michal Krol
02eb36fa8d re-enable slang sources 2005-03-14 12:43:59 +00:00
Michal Krol
0c7d2fff1e make it compile under linux 2005-03-14 12:24:32 +00:00
Michal Krol
5c9d21df3d make it compile under gcc 3.3.2 2005-03-14 12:23:14 +00:00
Michal Krol
8998de569c fix enum comma 2005-03-14 12:19:36 +00:00
Aapo Tahkola
278c6025f9 Replacing alpha test bits with values that give desired results as compaired to software rendering. Alpha test in textures is still completely broken as can be seen in progs/demos/fire and various games. 2005-03-13 12:23:08 +00:00
Felix Kuehling
4f05e61543 Updated savage_dri.h from Xorg CVS. This removes definitions that are
not part of the DDX->DRI interface and should never have been in this
file in the first place.
2005-03-13 00:20:03 +00:00
Felix Kuehling
45f26f9979 Removed savagedma.[ch]. They have been unused for a while and were only
kept around for reference. Now that command DMA is implemented in the
DRM module they are no longer needed.
2005-03-12 23:00:53 +00:00
Aapo Tahkola
203bd3e8ec Unlike radeon and r200 drivers r300AllocCmdBuf allocs dwords not bytes. 2005-03-12 10:14:09 +00:00
Ian Romanick
91c219d906 Add support for ARB_draw_buffers and ARB_occlusion_query. The GLX protocol
for these extensions (as well as ARB_vertex_program and ARB_matrix_palette)
was just approved by the ARB on 8-Mar-2005.  Now the only extension missing
for 1.5 support is ARB_vertex_buffer_object.

The opcodes for ARB_matrix_palette were also added to gl_API.xml.  Since
this extension isn't supported by Mesa, no code is generated for it.  Some
tabs were also converted to spaces in the comment for
GetCompressedTexImageARB.
2005-03-11 20:55:03 +00:00
Brian Paul
522ea42718 add MAT_DIRTY_FLAGS in _math_matrix_mul_floats(), (bug 2696) 2005-03-11 14:54:51 +00:00
Paul Mackerras
e24a9c10b5 Add suitable definitions for the _REV formats, plus a comment
explaining why they are the same as the non-REV formats now that
textures don't get byte-swapped on their way to the chip.
Fix the ARGB4444 and L8 formats.
Add entries for the A8 and RGB332 formats.
2005-03-11 11:38:23 +00:00
Felix Kuehling
96035d54f3 - Flush before updating the timestamp of a texture heap from a bound texture.
- Flush before using a new texture or before disabling a texture unit,
  because savageFlushCmdBuf can only update the timestamp of the last
  used texture. This fixes corruption in quake2 with single-textured
  lighting.
2005-03-10 22:45:00 +00:00
Felix Kuehling
746df56717 If the texture image changed force emitting the texture address, even
if it didn't change. This seems to flush texture cashes. Fixes
multi-textured lighting in quake2.
2005-03-09 15:28:47 +00:00
Vladimir Dergachev
5737fda093 Don't use R200 texture constants - R300 fields are all different. 2005-03-09 05:31:31 +00:00
Vladimir Dergachev
439f7feab1 Deal with texture formats in a more robust way. 2005-03-09 00:40:55 +00:00
Aapo Tahkola
f0d484fa5a Replacing some RADEON cmd types with r300 counterparts. 2005-03-08 22:29:45 +00:00
Aapo Tahkola
2579c32a5f Improving Vladimirs alpha test fix a bit as it turns out r300Enable didnt correctly disable alpha test. Vertex programs with high vertex count now run a lot faster as software fallback is no longer on. Also disabling 'temp to result'-instructions as they probably violate the spec and dont seem to be something thats needed. 2005-03-08 03:29:46 +00:00
Ian Romanick
0bd5373d94 Actually *use* the count_scale value associated with a parameter. 2005-03-06 08:55:39 +00:00
Felix Kuehling
9d05d3dd30 Don't synchronize after each frame. Allow the GPU to be one frame
ahead of the CPU for more parallelism of CPU and GPU. Unfortunately
there seems to be some broken hardware (like my ProSavageDDR) on which
status register updates are delayed sometimes. This leads to very
jerky animation if the hardware can buffer more than the current
frame. A new option "sync_frames" can be used as a remedy on such
broken hardware.
2005-03-06 03:52:01 +00:00
Felix Kuehling
e6aa21156a - Fixed two bugs related to DMA buffer handling that showed up with the
new DRM version 2.4 and command DMA.
- Flush less.
- Bumped the driver date.
2005-03-06 01:28:30 +00:00
Vladimir Dergachev
a30402b56a Add format 15. It turned out to be X,X,X,X,X8. 2005-03-05 22:20:57 +00:00
Dave Airlie
07561c6b32 Fixing memset on ia64 & other archs
From: Stephane Marchesin
2005-03-05 06:38:59 +00:00
Vladimir Dergachev
a4296239d4 Enable VB mode rendering by default. If anyone thinks this is wrong, *please* feel free to change it back.
My reasons:

    * immediate mode is broken
    * vb mode is faster
    * vb mode is the right way to do it.
2005-03-05 06:31:36 +00:00
Vladimir Dergachev
3f9467c946 Do properly initialize ALPHA_TEST register instead of carefully preserving bogus value. This fixes many, many rendering issues which I wrongly blamed on texture programming or performance.. 2005-03-05 06:10:09 +00:00
Dave Airlie
1bb14ad90c fix for solo to set the mode, and make solo gcc2 friendly...
From: Stephane Marchesin
2005-03-05 04:00:09 +00:00
Roland Scheidegger
87030f6618 remove one of the two _tnl_isolate_materials function calls 2005-03-05 00:04:20 +00:00
Adam Jackson
8ff72e9723 Add preliminary EGL headers. 2005-03-04 20:18:55 +00:00
Ian Romanick
b47731f24d Import fixes from X.org tree (Søren Sandmann <sandmann@redhat.com>). 2005-03-04 17:53:24 +00:00
Rune Petersen
bc6bf401f5 Set pipes for R420 cards. Gives a nice speedup. This needs to be tested on r420 cards with less than 16 pipes. 2005-03-04 15:48:40 +00:00
Vladimir Dergachev
984d527626 Add a couple of helper functions for completeness. 2005-03-03 23:18:19 +00:00
Ian Romanick
fdb5a87f91 Fix some errors in the parameter descriptions in serveral vertex / fragment
program related functions.
2005-03-03 21:22:46 +00:00
Ian Romanick
ce77d37264 Check for some common function parameter description errors in the
endElement handler for <function>.  This catches the errors as early as
possible and makes debugging other code easier.
2005-03-03 21:21:59 +00:00
Ian Romanick
6e776f25fd When building in the X-Server, attr.depth doesn't exist. Instead, use
(XMesaDrawable)w)->depth in the error message.
2005-03-03 19:56:11 +00:00
Brian Paul
c1f2f9090b change gl_buffer_object's Size field to GLsizeiptrARB type 2005-03-03 02:05:33 +00:00
Brian Paul
7644bfb536 Added linux-x86-32 config to force building 32-bit objects in a 64-bit environment. 2005-03-03 01:44:42 +00:00
Brian Paul
3e1961839e if building 32-bit objects in 64-bit environment, use -m32 flag 2005-03-03 01:38:13 +00:00
Alan Hourihane
fff3b2f318 use COPY_CLEAN_4V macro to replace using both ASSIGN_4V & COPY_SZ_4V 2005-03-02 18:57:01 +00:00
Brian Paul
b960c14cbb Added a bunch of new comments, minor code clean-ups. 2005-03-02 16:37:24 +00:00
Brian Paul
3db7ae3a38 Using glColor3 commands to update materials could result in an undefined
alpha value.  Fixed.
2005-03-02 16:31:58 +00:00
Brian Paul
7cd2ae9d97 added stub functions for GLX_MESA_allocate_memory 2005-03-01 02:51:07 +00:00
Ian Romanick
03dc437363 Clean-up some warnings caused by the addition of vertex / fragment program
protocol support (reported by Adam Jackson).  Added code to validate the
'type' parameter to the draw element functions.
2005-02-28 19:37:10 +00:00
Brian Paul
80875253ce additional parenthesis in TNL_CONTEXT macro (Nicolai Haehnle) 2005-02-28 17:45:11 +00:00
Aapo Tahkola
d1e40c9bdd fix for 'nasty bug' and some sanity checks to avoid buffer overruns. Bumping VSF_MAX_FRAGMENT_LENGTH as it seems a bit low otherwise. 2005-02-28 00:27:02 +00:00
Brian Paul
6c0c91714c silence warnings 2005-02-27 16:23:41 +00:00
hmarson
87a2f3df64 Added 0x4e51 - Saphire 9600 256MB
0x4e71 - Saphire 9600 256MB - Second Head...
2005-02-27 12:12:25 +00:00
Dave Airlie
ab7312ef63 precedence precedence precedence.. add some brackets 2005-02-27 07:43:18 +00:00
Brian Paul
67742383e8 Rename _mesa_update_buffers() to _mesa_update_draw_buffer_bounds() and do
additional checks.
Replace _mesa_init_buffers() with _mesa_init_scissor() and _mesa_init_multisample().
2005-02-26 17:16:12 +00:00
Dave Airlie
4932ba28ad Add a dri config option to enable the max texture level hack
make ycbcr depend on a CHIPSET define .. needs to be filled in though
2005-02-26 05:24:04 +00:00
Dave Airlie
8ca515097f use girl2.rgb by default 2005-02-26 04:56:25 +00:00
Dave Airlie
c68233cb35 Add glXAllocateMemoryMESA demo app using ycbcr...
add girl2.rgb which is a slightly resized girl.rgb so client texturing works
2005-02-26 04:51:47 +00:00
Dave Airlie
9bfd9582d4 bring over structs from Xorg glx.h to make Mesa glx.h the one true glx.h 2005-02-26 03:55:44 +00:00
Dave Airlie
24dcc6b6bf Add GLX_MESA_allocate_memory from Xorg glx.h 2005-02-26 03:51:17 +00:00
Ian Romanick
f3a6e4fa5b Fairly significant changes to enums.c and the way it is generated. enums.c
now contains 3 static tables.  The first table is a single, large string of
all the enum names.  The second table is an array, sorted by enum name, of
indexes to the string table and the matching enum value.  The extra string
table is used to eliminate relocs (and save space) in the compiled file.
The third table is an array, sorted by enum value, of indexes into the
second table.

The [name, enum] table contains all of the enums, but the table sorted by
enum-value does not.  This table contains one entry per enum value.  For
enum values that have multiple names (e.g., 0x84C0 has GL_TEXTURE0_ARB and
GL_TEXTURE0), only an index to the "best" name will appear in the table.
gl_enums.py gives precedence to "core" GL versions of names, followed by ARB
versions, followed by EXT versions, followed, finally, by vendor versions
(i.e., anything that doesn't fall into one of the previous categories).  By
filtering the unneeded elements from this table, not only can we guarantee
determinism in the generated tables, but we save 364 elements in the table.

The optimizations outlined above reduced the size of the stripped enums.o
(on x86) from ~80KB to ~53KB.

The internal organization of gl_enums.py was also heavily modified.
Previously enums were stored in an unsorted list as [value, name] tuples
(basically).  This list was then sorted, using a user-specified compare
function (i.e., VERY slow in most Python implementations) to generate a
table sorted by enum value.  It was then sorted again, using another
user-specified compare function, to generate a table sorted by name.

Enums are now stored in a dictionary, called enum_table, with the enum value
as the key.  Each dictionary element is a list of [name, priority] pairs.
The priority is determined as described above.  The table sorted by enum
value is generated by sorting the keys of enum_table (i.e., very fast).  The
tables sorted by name are generated by creating a list, called name_table,
of [name, enum value] pairs.  This table can then be sorted by doing
name_table.sort() (i.e., very fast).

The result is a fair amount more Python code, but execution time was reduced
from ~14 seconds to ~2 seconds.
2005-02-26 01:09:35 +00:00
Ian Romanick
4e262cfb07 Accidentally committed wrong version with the previous commit set. 2005-02-25 23:02:33 +00:00
Ian Romanick
40af76bbaa Add GLX protocol support for ARB_fragement_program,
ARB_fragment_program_shadow, ARB_vertex_program, NV_fragment_program,
NV_fragment_program_option, NV_fragment_program2, NV_vertex_program,
NV_vertex_program1_1, NV_vertex_program2, NV_vertex_program2_option,
NV_vertex_program3, and ATI_text_fragment_shader.
2005-02-25 22:46:30 +00:00
Ian Romanick
1fd3bbc42e Convert the static functions read_pixel_reply, read_reply,
setup_single_request, and setup_vendor_request to the global functions
__glXReadPixelReply, __glXReadReply, __glXSetupSingleRequest, and
__glXSetupVendorRequest.  This will make it easier to add handcoded Single /
VendorPrivate / VendorPrivteWithReply functions.
2005-02-25 01:48:25 +00:00
Aapo Tahkola
ac8020ea9c Another nasty struct size bug found. 2005-02-24 13:59:56 +00:00
Brian Paul
2c6f911e10 More GL_EXT_framebuffer_object: rename some things, added device driver hooks. 2005-02-24 05:47:06 +00:00
Felix Kuehling
7b7d00ca62 Don't forget to update a heap's timestamp when a texture image is
changed. Other drivers don't need to do this because they're swapping
modified textures out of texture memory, which implies a timestamp
update.
2005-02-23 20:51:27 +00:00
Ian Romanick
365a0a7c15 Missed the commit of glxext.c yesterday.
Fixed a flow control problem in glGet*v that could result in the display
not being unlocked.  This also resulted in refactoring a lot more code
out of the glGet*v routines into get_array_data, which was renamed to
get_client_data.
2005-02-23 20:06:52 +00:00
Ian Romanick
2b1ec683d3 Put quotes around $(CC) and $(CXX) so that 'CC=cache gcc' will work. 2005-02-23 19:24:30 +00:00
Brian Paul
ba0fe1832e minor changes to aid debugging, and a new comment 2005-02-23 16:54:18 +00:00
Felix Kuehling
540b260cbd With Savage DRM version 2.3.x or later use event counters for texture
heap aging, similar to the way it's done in the i810 and i855 drivers.
This avoids idling the engine on every texture upload.
2005-02-23 16:37:27 +00:00
Brian Paul
8f5f6b3d59 Sort the enums in the Python code, instead of at runtime. (Zack Rusin) 2005-02-23 16:36:17 +00:00
Ian Romanick
6614766f3e Corrected the value for X_GLrop_SecondaryColor3svEXT. 2005-02-23 00:47:11 +00:00
Ian Romanick
57b5e8538e Missed the Makefile with the previous commit. 2005-02-23 00:24:18 +00:00
Ian Romanick
fdb07636f2 Added __glExtensionBiIsEnabled and __GLXcontext::gl_extension_bits. This
enables libGL to query which extension are exported to applications.

Refactored array-query functionality (from glGet*v) in src/glx/x11/single2.c.

Massive re-write of indirect vertex array support.  The most noticable
effect is that glDrawElements now generates DrawArrays protocol.  The
side-effects (and the main reasons for the re-work) are that it is much
easier to add support for new arrays (e.g., GL_VERTEX_ATTRIB_ARRAY,
GL_WEIGHT_ARRAY_ARB, etc.) and it is much easier to add support for the new
DrawArrays protocol (required to support ARB_vertex_buffer_object).

These changes were primarilly tested with progs/demos/isosurf.
2005-02-22 22:36:31 +00:00
Brian Paul
cb83f62e30 now generated with Python script 2005-02-22 15:42:30 +00:00
Brian Paul
78123bb38b generate enums.c file (Zack Rusin) 2005-02-22 15:39:46 +00:00
Aapo Tahkola
3c69df8a70 New elt buffer code should be fairly stable. 2005-02-22 05:16:42 +00:00
Vladimir Dergachev
e00b729716 Add code to autogenerate vertex shaders.
This is needed for multitexturing to work properly.
2005-02-21 06:09:30 +00:00
Dave Airlie
a2990a9d73 Add DESTDIR install target 2005-02-21 00:20:19 +00:00
Dave Airlie
dee1c795c2 add more functionality to miniglx for glitz 2005-02-20 10:46:34 +00:00
Aapo Tahkola
eb6560bf2b Adding support for front buffer mode, removing some code we dont really need and some new debugging stuff. 2005-02-20 03:01:09 +00:00
Aapo Tahkola
35bc4ac680 Minor fix to border and blend color. 2005-02-19 16:30:56 +00:00
Aapo Tahkola
ff3ce3dd96 Disabling some fallbacks as they cause misc programs not to start and adding some comments. 2005-02-19 03:04:08 +00:00
Aapo Tahkola
42896b2a18 Fix for buffer overrun caused by ALLOC_STATE not having args surrounded by parenthesis. Can you see it? HINT: Anything texture related should now work slightly better. And yes it took me several hours to find it. 2005-02-19 02:25:53 +00:00
Nicolai Haehnle
10b892af96 Print an error if idling the engine before the buffer copy fails.
Be a bit more useful about the sync message after flushing command buffers.

Add an "allmsg" debug name that enables all log messages but does not
enable syncing.
2005-02-18 22:07:20 +00:00
Michel Dänzer
9605806d81 fd.o bug #2576: Add support for ATI RN50/ES1000. (ATI Technologies Inc.) 2005-02-18 20:03:33 +00:00
Nicolai Haehnle
3f22c0966d r300RefillCurrentDmaRegion: Retry buffer acquisition only once, after
waiting for the engine to idle. There's no way for another buffer to
become free anyway once the engine is idle.
2005-02-18 18:57:38 +00:00
Nicolai Haehnle
8281cca82f Always submit command buffers, even when there are no cliprects,
so that we no longer leak DMA buffers (plus, this just might fix some
state-setting related problems, if there were any - but that's unlikely).

Update the DRM to cope with cmdbuf->nbox == 0.
2005-02-18 18:28:52 +00:00
Aapo Tahkola
4d73f1af35 We dont need to call r300EmitAOS if we arent going to draw anything(r300_get_num_verts returns 0). 2005-02-18 16:58:19 +00:00
Nicolai Haehnle
26d812ae00 Reset nr_released_bufs to 0 after the command buffer has been submitted.
Added a more verbose comment about nr_released_bufs in r300_context.h
2005-02-18 16:34:14 +00:00
Brian Paul
f448e632b6 XMesaGetDepthBuffer() returned wrong bytesPerValue (Karl Schultz) 2005-02-18 14:49:27 +00:00
Brian Paul
49f7430b12 s/0/NULL/ (Jeff Muizelaar) 2005-02-18 14:44:00 +00:00
Nicolai Haehnle
d73b929ef2 Fix: RADEON_DEBUG is a bitfield, so use & to check for flags, not == 2005-02-18 11:27:24 +00:00
Nicolai Haehnle
6f37e76272 Fixing *lots* of warning messages, especially concerning unportable
whitespace before preprocessor commands.

Please, can you try to keep the warnings down? Try running make with
make -s sometime to see just how bad an offender the current code is.
2005-02-17 22:07:32 +00:00
Nicolai Haehnle
74477b24a8 RADEON_DEBUG is a bitfield, so use & instead of ==.
Also, put the hash in preprocessor directives at the beginning of the line
to fix error messages.
2005-02-17 21:45:20 +00:00
Aapo Tahkola
78152f85e7 Switching to start_index32_packet. 2005-02-17 18:16:46 +00:00
Aapo Tahkola
002a64cc48 magic_1 handling... 2005-02-17 18:02:28 +00:00
Ben Skeggs
ca4116bfce oops. 2005-02-17 14:34:51 +00:00
Brian Paul
0846e52d46 s/0/NULL/ (Jeff Muizelaar) 2005-02-17 14:12:50 +00:00
Brian Paul
6e2fd96627 remove extern (Jeff Muizelaar) 2005-02-17 14:11:56 +00:00
Ben Skeggs
a9eb712fc9 Make immediate code do a LOAD_VBPNTR again 2005-02-17 12:37:40 +00:00
Dave Airlie
934be3266f fix some 0->NULLs 2005-02-17 11:13:59 +00:00
Vladimir Dergachev
c8af2b5a52 Cleanup formatting a little bit. 2005-02-17 06:39:09 +00:00
Brian Paul
f321f16e83 fix non-Win32 definition of GLUTAPIENTRY, remove some cruft 2005-02-16 19:52:35 +00:00
Aapo Tahkola
41d180c899 Support for idx buffers. Leaving it on by default as it doesnt seem to cause any lock ups nor other issues. Tests with one object using elts should pass. Introducing more than one object will cause indices to mix up as far as i can see. DRM update is needed for this code to work\! 2005-02-16 19:04:32 +00:00
Rune Petersen
8eeef423e9 small cleanup, remove some warnings 2005-02-16 16:52:11 +00:00
Brian Paul
1ff8f50f2f fixed problems with parse_float() (fd.o bug 2520) 2005-02-16 15:08:29 +00:00
Brian Paul
2c28dd892c s/0/NULL/ (Jeff Muizelaar) 2005-02-16 15:02:25 +00:00
reist
5c2f3d5d3a get two textures to work 2005-02-16 10:38:57 +00:00
Ben Skeggs
d588311dbb Don't enable fog. It's broken 2005-02-16 06:24:07 +00:00
Ben Skeggs
f446027656 Share routing code between immd/vb. Fix breakage of vertex programs in vb mode. 2005-02-15 19:07:35 +00:00
Dave Airlie
233d93d47e Add missing texture formats for completeness 2005-02-15 11:20:11 +00:00
Dave Airlie
70f2be9cc6 add some missing texture formats and bits from r200 docs 2005-02-15 10:44:20 +00:00
Jerome Glisse
9e5a0b8895 Added texture format table for big endian (this is a tempory hack). 2005-02-15 10:40:34 +00:00
Dave Airlie
09298228c6 add EnableExtension so r200 enables all its extensions, add mesa memory
extension entry points
2005-02-15 08:40:24 +00:00
Roland Scheidegger
e82cb7852b remove accidentally commited printf for tiling support 2005-02-14 17:37:52 +00:00
Ian Romanick
4ea4589302 Simple test for GL_MESA_pack_invert. 2005-02-14 17:07:29 +00:00
Daniel Borca
a5f2dcb57b updated doc 2005-02-14 15:06:50 +00:00
Daniel Borca
72b2af6035 removed detritus 2005-02-14 15:05:24 +00:00
Daniel Borca
84396a72df separated DOS GLUT from GLX GLUT.
added a few FreeGLUT specific functions.
2005-02-14 15:04:52 +00:00
Aapo Tahkola
0340663eb7 Support for blend color(not tested), "proper line width/point size" clamps and fix for glxinfo problem. 2005-02-14 13:14:16 +00:00
Keith Whitwell
8352666a9d mesa-fix-one-bit-signed-bitfield.patch from Jeff Muizelaar 2005-02-14 09:36:00 +00:00
Dave Airlie
8d12a6d537 fix some signed vs unsigned warnings 2005-02-14 09:27:38 +00:00
Dave Airlie
fbdd7a5e74 fix signed vs unsigned comparison warnings in tnl_dd 2005-02-14 09:25:08 +00:00
Daniel Borca
aeee36a311 killed a few warnings 2005-02-14 08:19:54 +00:00
Daniel Borca
2f99f6558c added a bunch of const in the decoder 2005-02-14 08:08:35 +00:00
Daniel Borca
b6082fd236 static const' instead of const static' 2005-02-14 08:02:50 +00:00
Daniel Borca
0a13cebaa1 ProgramCallbackMesa must match the prototype 2005-02-14 08:01:59 +00:00
Eric Anholt
baa832d311 Change another usage of __AMD64__ to the standard __amd64__, and remove
__AMD64__ from the linux configs so it won't creep back in as easily.  Fixes
hang on FreeBSD on the first lock grab.
2005-02-14 06:57:27 +00:00
Eric Anholt
1718e34352 Don't forget to -L/usr/local/lib to grab expat. 2005-02-14 06:54:50 +00:00
Michel Dänzer
d5e008b84b Typo fix. 2005-02-13 18:37:36 +00:00
Rune Petersen
3271390362 initial r400 support: r400 cards are treated as RV350 for now. 2005-02-12 21:29:51 +00:00
Michel Dänzer
37cbb521d3 MMIO endianness fixes for Radeon drivers. 2005-02-12 20:37:07 +00:00
Brian Paul
2752177ade unlock mutex upon error return (Jeff Muizelaar) 2005-02-12 18:43:38 +00:00
Felix Kuehling
f640ee2f6e Fall back properly when GL_COLOR_LOGIC_OP is enabled and != GL_COPY.
Add missing per-primitive fallback for polygon stipple.
2005-02-12 16:02:30 +00:00
Felix Kuehling
25817dc26b Offset LOD bias by about 0.3 to match software rendering more closely.
Another small tweak to subtile upload (mostly cosmetic).
2005-02-12 14:37:17 +00:00
Felix Kuehling
ed9119b72a Make glean's masked clear test pass. 2005-02-12 14:35:17 +00:00
Felix Kuehling
0872b85b1e Savage3D-based chips seem so use a constant tile stride of 2048 for
vertically incomplete tiles, but only if the color depth is
32bpp. Nobody said this was supposed to be logical!
2005-02-12 14:03:05 +00:00
Ben Skeggs
6125515cec Enabled vertex buffer mode as default. 2005-02-12 11:15:55 +00:00
Keith Whitwell
cc70176446 Turn _via_fastrender_stage back on. 2005-02-11 18:25:55 +00:00
Keith Whitwell
a0c8524924 mesa-main-0-NULL.patch from Jeff Muizelaar 2005-02-11 09:34:05 +00:00
Ben Skeggs
2d10924a14 Port of r200 VB code. VB path should be as fast as the immediate path now, tuxracer should render correctly. Immediate path was left enabled. 2005-02-11 05:59:13 +00:00
Roland Scheidegger
4837ea3020 add texture micro and macro tiling to radeon/r200 driver. This can improve performance up to 15% in texture-intensive applications. Convert the driver to use the correct blit format and blit width instead of fixed blit format and blit width when uploading textures to make it work. 2005-02-10 22:36:06 +00:00
Roland Scheidegger
26d3159125 add the new RADEON_CUBIC_OFFSET/FACES state packets/registers to radeon (and r200) sanity code 2005-02-10 21:59:20 +00:00
Roland Scheidegger
b66251f76d (Andreas Stenglein) fix projected textures with swtcl, they need the w coordinate of the vertex (bugzilla #1648) 2005-02-10 18:28:44 +00:00
Brian Paul
d9468c9405 new comments, fix zoffset error test 2005-02-10 16:08:07 +00:00
Brian Paul
f901072afb lots of updates 2005-02-10 15:18:26 +00:00
Aapo Tahkola
1982a66838 Added kindly note about single buffer mode. 2005-02-10 12:40:41 +00:00
Aapo Tahkola
3f9bae90c3 Updating master copy of r300_reg.h and turning immediate mode back on 2005-02-10 11:02:55 +00:00
Keith Whitwell
b97e478fe9 mesa-tnl-0-to-NULL.patch from Jeff Muizelaar 2005-02-10 10:57:22 +00:00
Keith Whitwell
a9a4c5489e Catch no-op vertex buffers consisting only of vertices which will
also appear in a future buffer.
2005-02-10 10:55:30 +00:00
Aapo Tahkola
a85eb9c0a7 Removing some regs that are wrong and adding some comments to r300_reg.h . 2005-02-10 10:45:54 +00:00
Aapo Tahkola
dd951e6dde Support for PolygonMode. Not too far from working even though i almost gave up once already. 2005-02-10 08:56:35 +00:00
Vladimir Dergachev
d190734875 Fix copy'n'paste errors.
Print command buffer sizes during startup (TODO: remove 1 || when the driver is more mature).
2005-02-10 07:39:11 +00:00
Aapo Tahkola
4afa1d7abb Turns out unknown5 was border color. texwrap looks good now. 2005-02-10 05:11:31 +00:00
Aapo Tahkola
58010eb35c Adding support for selecting line width. Stipple patterns still cause lots of trouble. 2005-02-10 04:43:07 +00:00
Ian Romanick
816c0c932d Simple test for ARB_texture_env_crossbar functionality. It is difficult
to come up with good tests for this functionality that don't require
either ATI_texture_env_combine3 or NV_texture_env_combine4.
2005-02-09 22:16:38 +00:00
Brian Paul
4f1f5e336b glGet*(GL_FRAGMENT_PROGRAM_BINDING_NV) was returning the vertex program binding. 2005-02-09 18:46:16 +00:00
Brian Paul
a8d5b176b5 Added a test/clamp in the scale_internal_*() functions to prevent reading
a row of pixels beyond the input buffer's bounds.
FDO/Mesa bug #2510.
2005-02-09 16:18:39 +00:00
Aapo Tahkola
fe7aa08ad9 Enabled user-defined point size, enabled zbiases for rest of the primitives and fixed bad vertex number checks triggered by nurb. 2005-02-09 05:53:34 +00:00
Brian Paul
1f6735a6a5 initial support for GL_EXT_framebuffer_object 2005-02-09 03:51:11 +00:00
Brian Paul
f0bbbf66b8 implement the 'completeness' tests 2005-02-09 03:50:30 +00:00
Ian Romanick
d863424032 Generate GLX protocol for pixel single commands. 2005-02-09 03:11:23 +00:00
Felix Kuehling
799bc13da2 Fixed stride of incomplete tiles. 2005-02-09 00:45:16 +00:00
Keith Whitwell
4754fc653f SUBPIXEL fixes from Dieter 2005-02-08 20:52:02 +00:00
Vladimir Dergachev
85199453cc Remove #ifdef's around PolygonOffset function.
Print number of missing entry for texture format.
Add alpha-luminance format.
2005-02-08 20:27:09 +00:00
Ian Romanick
a91e0218a3 Correct a couple problems / omissions in the DTD. 2005-02-08 19:52:26 +00:00
Aapo Tahkola
5e4a7581df Typo.. 2005-02-08 19:29:05 +00:00
Aapo Tahkola
6a04cff065 Fix the bug and get zbias back into shape. There might still be some problems with initial zbias... 2005-02-08 19:26:59 +00:00
Michel Dänzer
3dec3c7a74 Call _mesa_ResizeBuffersMESA() in r200Viewport(), fixes incorrect rendering
in bzflag 2.0. (Alexander E. Patrakov)
2005-02-08 17:39:08 +00:00
Brian Paul
8e5f0e62dd clamp anisotropy against max value 2005-02-08 14:44:01 +00:00
Aapo Tahkola
46cde1715f BIG FAT NOTE: Theres a nasty bug somewhere thats causing vb color buffer clears and other things not to work. This bug can be triggered by extending struct r300_hw_state by two struct r300_state_atom's from its current size. Everything zbs and unk42B4 related is now covered with HAVE_ZBS and GA ifdefs. Who wants to fix it? Not i. :) 2005-02-08 07:05:25 +00:00
Adam Jackson
d084982240 Bug #2477: Make GLU/GLw/glut build properly even with -fvisibility=hidden. 2005-02-08 05:46:53 +00:00
Aapo Tahkola
4885a9eb20 Better fix to get tuxracer working. 2005-02-08 05:33:44 +00:00
Aapo Tahkola
1764b78ee9 fog + immediate mode = bad things 2005-02-08 04:46:39 +00:00
Aapo Tahkola
315afce941 Implemented checks that prevent r300 from locking up when bad number of verts are given. Also tweaked WARN_ONCE a bit to handle va-args. 2005-02-08 04:31:29 +00:00
Vladimir Dergachev
3f847b73f3 Let Polygon Offset be turned on and off. 2005-02-08 04:20:40 +00:00
Brian Paul
923b6fc4d9 just some comments 2005-02-08 04:08:56 +00:00
Brian Paul
1864c7d79a a bunch of assorted fixes 2005-02-08 03:46:37 +00:00
Brian Paul
386e997f45 plug in GL_EXT_framebuffer_object functions 2005-02-08 03:46:08 +00:00
Brian Paul
3d2e10564e removed GL_EXT_framebuffer_object tokens 2005-02-08 03:45:44 +00:00
Brian Paul
cf69e051ce added GL_EXT_framebuffer_object enums/funcs. Remove when glext.h is updated 2005-02-08 03:45:08 +00:00
Brian Paul
78e6e59477 Add new entrypoints for GL_EXT_framebuffer_object. 2005-02-08 03:44:24 +00:00
Ian Romanick
87440f531c Definitions for EXT_framebuffer_object. Just <include/> it in gl_API.xml
when ready.
2005-02-08 02:11:44 +00:00
Ian Romanick
6cfd4f7e55 Add the ability to include other XML files by using a
<include name="file"/> element as a sub-element of <OpenGLAPI>.
2005-02-08 02:11:14 +00:00
Brian Paul
463642c0be checkpoint latest work 2005-02-08 02:06:00 +00:00
Brian Paul
d1b1b37270 added missing prototype 2005-02-08 02:05:13 +00:00
Brian Paul
0d22b90540 indentation fix 2005-02-08 02:04:49 +00:00
Aapo Tahkola
27f75a863e To cut the long and boring story short, polygon offsets should now work. vb mode colorbuffer clears are still mysticly broken by offsets... Maybe we need to merge zbs and unk42B4 together? 2005-02-08 01:49:03 +00:00
Brian Paul
049290c584 improved warning message 2005-02-07 15:04:56 +00:00
Keith Whitwell
71699df7de argb8888 optimizations from via branch 2005-02-07 13:20:17 +00:00
Keith Whitwell
8d621b3bdd More texture enums (Andreas Stenglein) 2005-02-07 11:00:32 +00:00
Keith Whitwell
1f2b715988 GL_ARB_texture_rectangle enums (Andreas Stenglein) 2005-02-07 10:36:00 +00:00
Brian Paul
3deaa01c2b additional work on GL_EXT_framebuffer_object 2005-02-07 05:08:24 +00:00
Jerome Glisse
1e42244e82 Added PCI id (0x4152). 2005-02-06 12:37:23 +00:00
Felix Kuehling
66b48d6df6 Disable vertex DMA on SuperSavages. 2005-02-05 22:10:14 +00:00
Felix Kuehling
5bdf2bc6c7 - Fixed scissor rectangle not moving with the window (Xorg bug #1731).
- Flush buffered primitives before changing scissors.
- Require Savage DRM version 2.1.0, so that the broken single-cliprect
  code can finally rest in peace.
- Removed some more dead code.
2005-02-05 21:21:02 +00:00
Brian Paul
d9d972a944 added fbobject.c to sources 2005-02-05 20:00:15 +00:00
Brian Paul
ddc82eefca Some initial work on GL_EXT_framebuffer_object. 2005-02-05 19:56:45 +00:00
Jerome Glisse
2886579324 Added PCI id (0x4152). 2005-02-05 19:52:26 +00:00
Brian Paul
bb7d5f8837 Remove the Shared->TexObjectList pointer and Next field from gl_texture_object.
Was only used by two drivers to walk over all texture objects.  Can do that
via the hash table instead.
Cleaned up some comments for struct gl_texture_object.
2005-02-05 18:12:59 +00:00
Brian Paul
8c3ddf4270 add a few comments 2005-02-05 18:11:05 +00:00
Jerome Glisse
f955218bf1 Modified hw state for big endian computers. 2005-02-05 18:01:21 +00:00
Brian Paul
7aafcc86c7 remove dependency on Shared->TexObjectList 2005-02-05 17:43:33 +00:00
Brian Paul
ce657cf752 remove unneeded code 2005-02-05 17:38:13 +00:00
Brian Paul
cf899d400d removed need for Shared->TexObjectList, walk over texture hash table entries instead 2005-02-05 17:37:00 +00:00
Felix Kuehling
557dce9bc2 Fixed a typo in an assertion. (Don't understand how this ever compiled.)
Found by Andreas Stenglein.
2005-02-05 13:17:34 +00:00
Vladimir Dergachev
b64d4a27cb Warn of unknown texture formats. 2005-02-05 03:13:34 +00:00
Ian Romanick
a02b83115a Fix some mixed spaces / tabs issues in generated code. Commit generated
files that have been trivially changed by other recent commits.
2005-02-05 00:59:57 +00:00
Ian Romanick
0a755ade51 Enable client-side GLX support for texture compression extensions. 2005-02-04 19:29:30 +00:00
Felix Kuehling
19064f818a Added an option texture_heaps that allows selecting which texture heaps
will be used. Implemented this option in the Savage driver. On my
ProSavageDDR uploads to AGP memory are about 1.5 times as fast as
uploads to card memory. On non-IGP hardware the difference may be even
bigger. Now mplayer -gl is getting really usable.
2005-02-04 00:25:41 +00:00
Felix Kuehling
cbff5db516 Made subtile upload a template. This speeds up tiled texture uploads by
about a factor 1.3.
2005-02-04 00:17:21 +00:00
Felix Kuehling
64b85b4563 Use all texture heaps in a fair way when textures need to be kicked in
order to make room for new textures. In particular this fixes texture
trashing on the first heap when the second heap is occupied by
currently unused textures (observed with Torcs and the Savage driver).

Heaps are weighted by their sizes by default but drivers can override
these and apply their own weights based on relative texture upload
speeds to the respective heaps.
2005-02-03 21:40:21 +00:00
Aapo Tahkola
9ea600ff3f Removing some trash and disabling fog fallback as it seem its causing more harm than good. Tuxracer should now work at least with vbs. Fix for vb colorbuffer clear bug is underway... 2005-02-03 19:51:57 +00:00
Aapo Tahkola
fe58074dea Changing vb code to handle inputs correctly. 2005-02-03 19:43:27 +00:00
Vladimir Dergachev
c326f9ffae Start beginning of pixel shader generator.. 2005-02-03 17:48:32 +00:00
Vladimir Dergachev
54b03eefda Forgot to increase the length. 2005-02-03 16:05:21 +00:00
Vladimir Dergachev
d26e464b6a Looks like we need at least one instruction for pixel shader. 2005-02-03 16:01:46 +00:00
Vladimir Dergachev
4c56261075 Get vertex programs supplied by the user work properly with immediate mode - vertex buffer mode worked by accident.
Fix alu_offset in SINGLE_TEXTURE_PIPELINE.
2005-02-03 15:44:06 +00:00
Vladimir Dergachev
19b260119a Since high bits can be used for flags, mask them out.
This stops arbvpwarpmesh from segfaulting and it actually works - with immediate mode rendering.
2005-02-03 06:33:44 +00:00
Vladimir Dergachev
3f0926b612 Remove redundant instructions from fixed pipelines, looks like they do not do anything, at least on my hardware. 2005-02-03 04:16:59 +00:00
Vladimir Dergachev
cb085044c9 Mark ZBIAS definitions. 2005-02-03 03:48:22 +00:00
Vladimir Dergachev
f350617c24 This was too optimistic sorry - all that register does is something weird with polygon culling. 2005-02-03 03:47:12 +00:00
Vladimir Dergachev
f46de6f23b Get Polygon offset fill to work.
Make WARN_ONCE message more informative.
2005-02-03 03:43:01 +00:00
Ian Romanick
94a20cbadf Added a bunch of extensions that were previously supported but weren't
in the gl_API.xml database.  Add "official" support for SGI_color_matrix
and SGI_texture_color_table.  These were previously supported only by
way of ARB_imaging.
2005-02-03 00:38:40 +00:00
Felix Kuehling
eba5b610b9 Check for heap == NULL before driSetTextureSwapCounterLocation. 2005-02-02 15:57:25 +00:00
Felix Kuehling
2eb9e67a5a Don't try to kick textures from a NULL tex heap. 2005-02-02 15:52:29 +00:00
Felix Kuehling
8b21166c14 Fixed flushing of client-side vertex buffers. 2005-02-02 14:43:03 +00:00
Felix Kuehling
1a141b9161 Fixed some debug output that was unconditionally enabled. 2005-02-02 14:42:00 +00:00
Brian Paul
6286dda286 clamp viewport against ctx->Const.MaxViewportWidth/Height instead of MAX_WIDTH/HEIGHT 2005-02-02 14:12:59 +00:00
Aapo Tahkola
1a1c49f8a6 Changed parts of r300_setup_routing to use WARN_ONCE. 2005-02-02 13:29:11 +00:00
Ian Romanick
3fec8c24ec Small refactor. Add glXFunctionIterator, which derrives from
glFunctionIterator and is used by GlxProto.  The difference between the two
iterator classes is that glXFunctionIterator skips functions that the GLX
protocol code does not care about.

Replace all the remaining occurances of glParameter::p_count_parameters and
glFunction::count_parameters with the count_parameter_list.

Add GlxProto::size_call to generate the C code to calculate 'compsize'.

These trivially modify the generated code.
2005-02-02 00:54:45 +00:00
Aapo Tahkola
6b158a7d23 Add a missing break and a reminder. 2005-02-01 23:12:36 +00:00
Aapo Tahkola
b5c90ca7d9 Implement appropriate src checks for attribs/params. 2005-02-01 22:45:11 +00:00
Aapo Tahkola
b5128c6e82 Implemented bunch of ops. 2005-02-01 19:56:52 +00:00
Aapo Tahkola
7bccfa1026 Vertex programs work now with some restrictions. I expect arbvptorus to work
correctly when normals are delivered. Please note that some programs only
start in vb mode as there is something wrong in immediate mode vb code.
2005-02-01 16:56:52 +00:00
Vladimir Dergachev
5dd4030e76 Make WARN_ONCE messages more informative. 2005-02-01 15:51:54 +00:00
Vladimir Dergachev
6d419feec7 Reduce noiseness of the driver. 2005-02-01 15:46:23 +00:00
Vladimir Dergachev
88e155e353 Get alpha in textures to work properly. 2005-02-01 15:27:36 +00:00
Vladimir Dergachev
d4697b0997 Properly set ABLEND and CBLEND registers. The older code worked, but by accident. 2005-02-01 06:55:58 +00:00
Vladimir Dergachev
4a3c6095fc Looks like we can define FIRE_VERTICES correctly. 2005-02-01 05:59:00 +00:00
Vladimir Dergachev
0ab7fb56f5 It helps to print actual values instead of random ones. 2005-02-01 05:58:27 +00:00
Ian Romanick
c2803587b6 Small refactor. Move several utility functions from glX_XML.py to
FilterGLAPISpecBase (in gl_XML.py).  When these functions are used to emit
common #define lines, the will automatically be undefined in
FilterGLAPISpecBase::printFooter if header_tag is set (i.e., the file is a
header file).

These changes do not modify the generated code.
2005-02-01 00:28:47 +00:00
Ian Romanick
ba09c19ed6 Add GlxProto::createEnumFunction and add a 'context' parameter to the
glXEnumFunction constructor.  The allows sub-classes of GlxProto to
over-ride the concrete class used for glXEnumFunction.

In addition to tracking p_count_parameters in glParameter, break the comma
separated list of parameter names into a Python list called
count_parameter_list.  It is now possible to query if a name is the name of
one of the count parameters just by comparing
param.count_parameter_list.count(n) to zero.  Eventually the remaining uses
of p_count_parameters will be replaced with uses of count_parameter_list.

Make sure that 'void *' parameters are handled correctly in
glParameter::size_string.

Add PrintGlxReqSize_h and PrintGlxReqSize_c.  These classes emit prototypes
and functions used on the server-side to determine the expected size of an
incoming GL command.
2005-02-01 00:13:04 +00:00
Adam Jackson
886280763c Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless. 2005-01-31 23:40:05 +00:00
Daniel Borca
fc4cabbfa8 makefile update (readtex, showbuffer) 2005-01-31 13:23:55 +00:00
Vladimir Dergachev
e61c8a5c63 Add magic sequence to prevent ClearBuffer from locking up.
Change Polygon.OffsetFill from fallback to warn once.
Quake demo now works, modulo texture rendering issues due to absent pixel shader pipeline.
2005-01-31 06:41:55 +00:00
Vladimir Dergachev
9c1773e505 Use SecondaryColorPtr, not ColorPtr[1] (the latter is NULL).
This fixes segfault in tuxracer-demo. It locks up after this though.
2005-01-31 02:52:59 +00:00
Vladimir Dergachev
15f108335a My bad, the old code works fine if updated to newer Mesa tree. 2005-01-30 22:16:28 +00:00
Vladimir Dergachev
0cd936c01f struct ati_fragment_shader was not defined anywhere, define it to get r300_vertexprog.c to compile. 2005-01-30 22:04:40 +00:00
Brian Paul
b55117042f fix max viewport query 2005-01-30 17:18:08 +00:00
Aapo Tahkola
29d021cd31 Fix for compiler warnings. 2005-01-30 11:12:59 +00:00
Dave Airlie
3aa69b39bf add number of passes count to ati_fragment_shader 2005-01-30 06:24:30 +00:00
Felix Kuehling
5ff53cb448 * Fixed uploading of textures of certain sizes.
* When glTexSubImageND is used, track the set of changed tiles in a
  bit vector and upload only dirty tiles later. This should improve
  the performance of dynamic light maps and gl movie player plugins.
* Renamed debug item "lru" to "tex". Indicate which levels are
  uploaded completely or partially.
2005-01-29 23:26:23 +00:00
hmarson
9ff3c49ef2 Added 0x4e54 (Thinkpad r50p) as PCI_CHIP_RV350_NP 2005-01-29 20:41:31 +00:00
Aapo Tahkola
941d6b008f Beginings of program generation. This code havent been tested nor hooked up. 2005-01-29 17:57:07 +00:00
Brian Paul
3bde211549 remove stray span.y++ 2005-01-29 17:28:45 +00:00
Brian Paul
98a9ad9241 added osmesa16 stuff 2005-01-29 13:48:43 +00:00
Brian Paul
371f576731 assorted fixes 2005-01-29 13:48:27 +00:00
Brian Paul
58f4d67703 fix initial viewport size bug 2005-01-29 13:36:15 +00:00
Brian Paul
c84cde7b0b added missing glFinish() 2005-01-29 12:57:36 +00:00
Aapo Tahkola
fbb478c946 Cleaning up. 2005-01-29 07:17:27 +00:00
Ian Romanick
16c3c74018 Refactor the code to emit multiple-inclusion protection to
FilterGLAPISpecBase.  Since the size_h mode of glX_proto_size.py will be
used to generate multiple header files, add an option to specify the define
that is used for multiple-inclusion protection.

The changes to the header files in this commit are just a side-effect of the
changes to the Python scripts.
2005-01-28 19:00:54 +00:00
Michal Krol
8d27148bbd move file 2005-01-28 18:39:26 +00:00
Ian Romanick
54584df8cc Properly annotate variable-length output parameters. Make sure that the
client-side code doesn't try to calculate the size of the output
parameters.  The server will tell the client how big it is.
2005-01-28 18:20:43 +00:00
Ian Romanick
20b8d9c1b9 Fix some get / set errors with COLOR_TABLE_*. SCALE and BIAS can be
parameters to GetColorTableParameter[if]v.  FORMAT, WIDTH, and the SIZE
enums cannot be parameters to ColorTableParameter[if]v.
2005-01-28 17:58:58 +00:00
Ian Romanick
fdb0527ddc Slightly modify the meaning of the 'handcode' attribute in a 'glx' element.
The attribute can now take one of 4 states.  "false" (the default value)
means that no handcoding is required for the function.  "client" means that
the function must be handcoded on the client-side only.  "server" means that
the function must be handcoded on the server-side only.  "true" menas that
the function must be handcoded on both the client-side and the server-side.

Version 1.14 of glX_proto_send.py accidentally contained a line of this
change.
2005-01-28 17:30:25 +00:00
Ian Romanick
1fca563232 Add an option to emit extra debug code in the generated protocol functions.
The debug version of indirect.c has proven very helpful during the
development of new client-side and server-side GLX protocol code.  This is
put here instead of in the DISPATCH and DISPATCH_RETURN macros in dispatch.c
for two reasons.

1. I only want the debug information when indirect-rendering is used.

2. Functions that require a reply from the server, some of which do not have
a return value (e.g., glFlush, glFinish, glGetLightfv, etc.), do not need
the extra glFinish call.
2005-01-28 16:51:01 +00:00
Aapo Tahkola
b365d28627 Fix wrong comment. 2005-01-28 11:59:37 +00:00
Aapo Tahkola
e451a95ecc Forgot one comment... 2005-01-28 10:08:00 +00:00
Aapo Tahkola
f856b3f10f Add basic sceleton for vertex programs + some other fixes 2005-01-28 09:57:06 +00:00
Ian Romanick
6398a97aff Mark a couple more function parameters as counters. 2005-01-27 19:50:59 +00:00
Ian Romanick
82e22f50f1 Add numerous 'get'-type functions to most of the enums supported by the
server-side GLX implementation.

Correct the protocol for EXT_convolution.  Several functions were
incorrectly listed as 'sop' that should have been 'vendorpriv'.

Remove TexParameter[if]v from the list of functions associated with
TEXTURE_RESIDENT.  The state associated with this enum is read-only.

Sort the enums by value for each particular size.  This ensures that the
signature is the same no matter what the ordering is of the enums in the XML
file.  The side effect is that there are some extra changes in
indirect_size.c.
2005-01-27 19:39:16 +00:00
Aapo Tahkola
d773598224 Add vector distance operator for vertex programs. 2005-01-27 04:42:52 +00:00
Ian Romanick
5aa6dc329b The 'mode' setting of a function within an 'enum' element is now used.
Parameters to glX_proto_size.py are now used to determine whether to emit
either get-type function, set-type functions, or both.  When only get-type
functions are emitted, they can optionally alias set-type functions.  This
would be useful if, for example, the two types were in different source
files.

The real work to implement this is in SizeStubFunctionIterator class.  All
of the logic for which functions to iterate and in which order is
implemented there.
2005-01-27 01:08:48 +00:00
Ian Romanick
5b0dd89370 remove a bunch of temporary #defines, now that glext.h was updated 2005-01-26 19:19:06 +00:00
Roland Scheidegger
a205137423 (Stephane Marchesin, me) Add support for color (framebuffer) tiling to the radeon and r200 driver 2005-01-26 18:05:03 +00:00
Roland Scheidegger
7104ce0a0e new version check to allow to test for a range of ddx major versions, instead of just one major version 2005-01-26 18:02:19 +00:00
Brian Paul
914746b400 remove a bunch of temporary #defines, now that glext.h was updated 2005-01-26 14:45:38 +00:00
Roland Scheidegger
0cbc25480f replace magic number with macro constant RADEON_ZBLOCK16 2005-01-26 14:20:14 +00:00
Brian Paul
8f029f175e just comments/clean-up 2005-01-26 14:02:50 +00:00
Brian Paul
7c58a00a50 added mutex to-do comment 2005-01-26 14:01:53 +00:00
Brian Paul
d01292bc54 just fix a comment and update date 2005-01-26 14:01:28 +00:00
Daniel Borca
b07390c8fd RGB/LUMINANCE texelfetchers (float version) returned 255.0F for alpha channel, instead of 1.0F 2005-01-26 09:47:32 +00:00
Ian Romanick
38e6e09cb8 Add a glFunctionIterator class to iterate over the functions stored in a
higher-level API object.  Use this type of object to implement the
printFunctions method.  Modify other functions that iterate over the list of
functions to use this type of object.
2005-01-25 23:53:13 +00:00
Aapo Tahkola
e4d41524a2 Fixes for clamp modes. 2005-01-25 19:09:23 +00:00
Brian Paul
f106493d8b Use the _mesa_HashNextEntry() function to walk over all textures in the
hash table.
Moving toward removing the gl_texture_object's Next pointer (only used by
glide and tdfx drivers).
2005-01-25 15:16:02 +00:00
Ian Romanick
01ec76dbd5 Stupid text editor...convert wayward tabs to spaces. 2005-01-25 01:36:32 +00:00
Ian Romanick
85f0fa3761 Add a "count" attribute to "enums" elements to set the default count
used for "size" sub-elements.  In the future the "count" attribute may
be removed completely from "size" sub-elements, so gl_API.xml was also
updated.

Support was added for a (currently unused) "mode" attribute for "size"
elements.  Basically, functions are marked as either "get" or "set".  This
will be used in generating size functions for the server-side (where the
"get" functions have to know how much data to return).  It could also be
used to help generate code for src/mesa/main/get.c.
2005-01-25 01:20:11 +00:00
Ian Romanick
cb59bd44db Correctly set the name of the generating script. 2005-01-24 22:07:00 +00:00
Ian Romanick
00772ac42f Move all the code for generating "size" related functions to its own
source file.
2005-01-24 21:56:05 +00:00
Ian Romanick
ad15f1bdea Correct some of the dependencies and clean things up a bit. 2005-01-24 21:43:29 +00:00
Ian Romanick
5ff2b94630 Remove glEnum::startElement, but refactor out some of the common code from
there and glXEnum::startElement to glEnum::process_attributes.
2005-01-24 21:29:13 +00:00
Ian Romanick
0246b2a5c0 Since only one of the places that used glXFunction::command_payload_length
actually used both values, it was refactored into command_fixed_length and
command_variable_length.  glXFunction::offset_of_first_parameter was also
added.
2005-01-24 20:59:32 +00:00
Ian Romanick
7f958e9e11 Make sure that functions added to gl_API.xml that do not have any GLX
section are marked as ignored.  Also ignore any functions that don't have
assigned dispatch offsets.

Fold Adam Jackson's changes to indirect_size.c into the generator scripts so
that they don't get lost.  "DO NOT EDIT" really means "DO NOT EDIT". ;)
2005-01-24 20:08:28 +00:00
Aapo Tahkola
f9f2db5132 border_color causes lockups with vertex buffers. Disabling for now. 2005-01-24 19:26:20 +00:00
Vladimir Dergachev
d7d54423a8 Remove lots of old code that dealed with "magic" texture formats. 2005-01-24 17:09:17 +00:00
Brian Paul
5c6b391900 reenable some assertions 2005-01-24 15:41:08 +00:00
Felix Kuehling
428a5e82fc Converted the Savage texture management to use Ian's common texmem code. 2005-01-24 01:15:12 +00:00
Brian Paul
c74ffb8266 Added _mesa_HashNextEntry() function to allow walking over all entries
in a hash table.
Added _mesa_test_hash_functions() for unit testing.
Updated comments, etc.
2005-01-24 00:20:23 +00:00
Dave Airlie
72e3664996 reapply Keiths workaround for zbs emit that got dropped during
state change patches....
2005-01-23 22:09:30 +00:00
Nicolai Haehnle
0b5a5a9efb Remove unused variables from r300_context 2005-01-23 17:35:05 +00:00
Nicolai Haehnle
4ced594aa8 Fix more warnings and compilation issues. 2005-01-23 17:28:04 +00:00
Nicolai Haehnle
cb77dcf0b9 Synchronize r300_reg.h.
Fix unportable whitespace before preprocessor commands.
2005-01-23 17:05:32 +00:00
Dave Airlie
150ed2e43d add sync debugging to the radeon driver 2005-01-23 06:27:08 +00:00
Adam Jackson
999534216d HAVE_ALIAS was never defined anywhere, add some logic to turn it on
automagically.
2005-01-23 03:54:38 +00:00
Adam Jackson
e82d5f2be9 silence makedepend warnings about non-portable whitespace 2005-01-23 02:12:23 +00:00
Felix Kuehling
8736c228cb Fixed initialization of draw destination to front buffer on single
buffered visuals. Also don't change span draw/read buffers in
savageDDDrawBuffer. Now glean's polygon offset test works (and PASSes
with fixed point depth buffer) with single buffered visuals without
winding up in an infinite loop.
2005-01-23 01:46:14 +00:00
Felix Kuehling
3b50f00433 My last attempt to fix polygon offsets with the reversed viewport depth
range used by the savage driver by negating ctx->MRD broke polygon
offsets with software fallbacks. This one adds a REVERSE_DEPTH parameter
to t_dd_tritmp.h (defaults to 0) that allows reversing polygon offsets
for hardware rendering but not for software fallbacks. For software
fallbacks depth values are reversed after polygon offsets have been
applied by the depth span functions.
2005-01-23 01:42:01 +00:00
Keith Whitwell
36a35c5614 Determine ahead of time whether a display list will include vertices
which have to be processed in the 'loopback' path.  If so, send
all vertices that way as the transition from playback->loopback has
several problems.
2005-01-22 14:38:00 +00:00
Vladimir Dergachev
8fca9bdc35 Properly configure routing - based on advice by Keith Whitwell. 2005-01-22 03:33:10 +00:00
Felix Kuehling
f4cafc8d13 Fixed polygon offset with reversed viewport depth range. 2005-01-22 00:52:31 +00:00
Vladimir Dergachev
4ac53aed6c Properly input stencil info contributed by Wladimir. 2005-01-21 21:30:55 +00:00
Brian Paul
1060211918 fix glGetString funniness 2005-01-21 16:35:56 +00:00
Michal Krol
308fbb7b64 add getstring.c; remove arb*.h nv*.h stuff 2005-01-21 15:55:13 +00:00
Michal Krol
8346c5ee1d add slang/traverse_wrap.h 2005-01-21 15:52:17 +00:00
Michal Krol
b39665950e Handy TIntermTraverser class wrapper 2005-01-21 15:51:28 +00:00
Alan Hourihane
e51b0b1d30 silence the 'using AGP/PCI' string unless VIA_DEBUG is used. 2005-01-21 09:50:48 +00:00
Felix Kuehling
fa15f6c840 Small cleanup:
* Remove some unused (mostly empty) functions
* Added context parameter to WAIT_IDLE_EMPTY[_LOCKED] for consistency
* Added debug messages to WAIT_IDLE_EMPTY[_LOCKED]
* Don't flush empty command buffers
2005-01-21 01:39:09 +00:00
Felix Kuehling
677d1d07c4 * Added options for disabling the fast path (render stage) and vertex DMA
* Fixed disabling of the render stage
* Added debug output for per-primitive fallbacks
* Bumped driver date
2005-01-20 15:18:10 +00:00
Brian Paul
14dee36fa7 glext.h version 26 2005-01-20 15:07:42 +00:00
Felix Kuehling
edb9a165c1 Added support for ELTS to the _savage_render_stage. Requires at least
Savage DRM version 2.2.0. Otherwise the render stage is disabled.
2005-01-20 13:59:49 +00:00
Alan Hourihane
ddfa61ee19 Enclose passed macro values in brackets to ensure correct read/write span
values.
2005-01-20 13:24:08 +00:00
Brian Paul
cb3bc2c49a document new glDeleteTextures/Buffers/Programs behaviour 2005-01-20 04:03:37 +00:00
Brian Paul
ea2943efd9 Update glDeletePrograms/Buffers() so that the ID is freed immediately, like
texture objects.
2005-01-20 04:02:02 +00:00
Brian Paul
36da0459e4 Use a simple CSS style sheet. 2005-01-20 03:55:10 +00:00
Brian Paul
10378919d7 Removed gl_texture_object's DeletePending. Changed a comment. 2005-01-19 21:41:24 +00:00
Brian Paul
31fb7648fc added texobjshare.c 2005-01-19 14:52:13 +00:00
Brian Paul
4f6d9aaa9a test program for texture sharing, deleting, etc 2005-01-19 14:51:41 +00:00
Brian Paul
42fee73aad Change behaviour of glDeleteTextures as discussed on ARB list.
glDeleteTexture makes the texture ID immediately free for re-use
while the actual texture object lingers until its reference count goes
to zero (when no longer bound by any rendering context).
2005-01-19 14:50:52 +00:00
Brian Paul
140f99f81c make sure the new instruction Data pointer is set to NULL 2005-01-19 14:45:23 +00:00
Brian Paul
7948bc02ed fix a typo 2005-01-19 14:44:55 +00:00
Brian Paul
4ef0e046ec minor formatting fix 2005-01-19 14:44:41 +00:00
Keith Whitwell
2aa34ea984 Bring the texcombine fixes to the trunk. 2005-01-19 12:09:33 +00:00
Keith Whitwell
bdb5725bab Always use ARGB8888 hardware texture format when mesa specifies
MESA_FORMAT_ARGB8888.  Previously attempted to use ARGB0888 under some
circumstances, but glean failed and demos/texenv.c was also incorrect.
2005-01-19 12:06:17 +00:00
Keith Whitwell
6931087958 Remove depend on make clean 2005-01-19 11:39:23 +00:00
Keith Whitwell
520e56f232 Depend tweaks 2005-01-19 11:10:27 +00:00
Daniel Borca
c98323bd89 make sure we avoid assertion failure wrt VB->ColorPtr[1]->stride 2005-01-19 07:57:52 +00:00
Daniel Borca
9ebce91a66 glVertex* is the provoking "cmd" (that is, by the time of glVertex*, we must have all other attributes already set).
i am committing this before i forget.  however, i'm still leaving my code disabled, because the old code seems legal.
2005-01-19 07:52:49 +00:00
Daniel Borca
59c2e16e75 There is no point trying to detect SSE at all, when MESA_NO_SSE is defined. I am committing this because the current WIN32 SSE detection code crashes UnrealTournament2003. 2005-01-19 07:43:13 +00:00
Brian Paul
c47d19a1a2 minor reorg of shader files, disable building for now 2005-01-18 22:58:13 +00:00
Alan Hourihane
41db4e1be5 remove some debug 2005-01-18 21:57:48 +00:00
Alan Hourihane
95be63771a Fix tristrips (which fixes coloredTexPerf2 & coloredLitPerf2 glean tests) 2005-01-18 15:06:01 +00:00
Michal Krol
4cfd97e3a8 remove #ifndef linux, it isnt defined on Linux, where should I define it? 2005-01-18 14:21:50 +00:00
Michal Krol
c57a312978 comment out _THROW calls, dont want to compile under Linux 2005-01-18 14:19:46 +00:00
Michal Krol
fa32c92ea5 add shader/slang/slang_mesa.cpp 2005-01-18 14:17:37 +00:00
Michal Krol
a885c7a6e0 change .cc suffix to .cpp 2005-01-18 14:16:51 +00:00
Michal Krol
619f006bba add slang preprocessor C sources; add slang include directories 2005-01-18 14:02:52 +00:00
Michal Krol
955190fbad fix // comments 2005-01-18 13:58:56 +00:00
Michal Krol
092af29ea1 fix MAX_VERTEX_ATTRIBS_ARB query 2005-01-18 12:04:53 +00:00
Keith Whitwell
af72b4dd8e Fix calculation of last_count in _tnl_wrap_buffers() 2005-01-18 08:41:55 +00:00
Brian Paul
7443c2caa6 added rule for compiling C++ sources 2005-01-17 22:33:50 +00:00
Michal Krol
db99b8b29d add slang/ directory tree 2005-01-17 16:25:08 +00:00
Brian Paul
ea28a5b5b3 use FABSF(fogCoord) to fix fog calculation problem (Soju Matsumoto) 2005-01-17 16:16:35 +00:00
Brian Paul
730fabd67a fix some weirdness accidentally checked in in the past 2005-01-17 16:14:46 +00:00
Michal Krol
7d079fd780 2005-oct-19 3dlabs slang compiler, tweaked a little bit 2005-01-17 16:01:49 +00:00
Michal Krol
cc9ab78158 slang to mesa compatibility, tested only under Windows 2005-01-17 15:52:20 +00:00
Michal Krol
434f622ede add 3dlabs_shhandle interface 2005-01-17 15:47:57 +00:00
Michal Krol
0a7ea2b0c3 add [.slang] to INCDIR, fix comma in OBJECTS 2005-01-17 15:35:46 +00:00
Michal Krol
389e292a1b add src/mesa/shader/slang to INCLUDE_DIRS 2005-01-17 15:32:25 +00:00
Daniel Borca
ff39c65dee cleaned up warnings 2005-01-17 08:05:47 +00:00
Daniel Borca
714c36c120 allow more internalFormat/format combinations (i hope i got it right) 2005-01-17 08:04:39 +00:00
Daniel Borca
d98c47300a fix compilation error for fx/Mesa 2005-01-17 08:02:42 +00:00
Daniel Borca
6a432a7c50 since we've already messed up this one, let we do it further and make it look like a fire... 2005-01-17 07:48:53 +00:00
Daniel Borca
a6ddd2494a remove trailing slash from TOP definition 2005-01-17 07:47:41 +00:00
Brian Paul
0a360cfab5 silence warning 2005-01-17 01:21:03 +00:00
Brian Paul
848ff85157 clean up gl2 structs 2005-01-17 01:07:00 +00:00
Brian Paul
fc3028d2c7 silence a bunch of warnings 2005-01-17 01:02:40 +00:00
Brian Paul
6c58ddae17 fix a few warnings 2005-01-17 00:40:29 +00:00
Brian Paul
b4199a1f71 added getstring.c 2005-01-16 19:42:46 +00:00
Brian Paul
5255044c00 added a few OpenGL 2.0 tokens (temporary) 2005-01-16 19:40:15 +00:00
Brian Paul
169a723d2b _mesa_GetInteger/Float/Boolean/Doublev() are now generated with the new
get_gen.py Python script.
Moved GetString(), GetPointer(), GetError() into new getstring.c file.
2005-01-16 19:39:10 +00:00
Brian Paul
c07ec046b7 make tnl_clipspace_attr->insert field const, to silence warning 2005-01-16 17:59:50 +00:00
Aapo Tahkola
14aea4a485 This fixes it but why mipmaps still work?
It doesnt look like filter constants in r300_reg.h would define number of
levels.
2005-01-16 17:07:24 +00:00
Aapo Tahkola
781d512a0b I was wrong... 2005-01-16 16:12:05 +00:00
Aapo Tahkola
82d1421736 Looks like masking masking t->filter isnt needed anymore.
texwrap still shows some problems with clamp mode with nearest filtering.
2005-01-16 13:28:49 +00:00
Felix Kuehling
ad360a81bd Added a fast path for emitting unclipped primitives directly to a
vertex buffer. ELTS are not supported yet (missing functionality in
the DRM). You need at least Savage DRM version 2.1.3, which fixes a
bug that screwed up triangle fans and strips.

Moved the texture normalization stage to savagerender.c.
2005-01-16 01:28:26 +00:00
Vladimir Dergachev
ca710a0a7f On the way to getting stencil working. 2005-01-15 20:44:23 +00:00
Vladimir Dergachev
76de160b64 On the way to getting stencil and texture formats working.
Looks like the matter of texture formats is a lot simpler, with the wrong
display in quake explained by the fact that we are not handling texture combine modes.
2005-01-15 19:33:19 +00:00
Felix Kuehling
b5f49e6f91 Converted to use spantmp2.h. 2005-01-15 14:37:33 +00:00
Felix Kuehling
c478a09a5b Use HW_READ_LOCK and HW_READ_UNLOCK in assembler-optimized span read
functions.
2005-01-15 14:35:35 +00:00
Vladimir Dergachev
dbb3ec35a7 Use symbolic constants to describe pixel shader ALU instructions. 2005-01-15 04:17:27 +00:00
Aapo Tahkola
ffe7496ac3 Added fixes for filter modes and support for anisotropy filters.
Wrap modes would work perfectly but i messed up something when cleaning up
the code :/ Border color code is incomplete because i forgot to check how to
set border size :)
2005-01-14 21:53:00 +00:00
Alan Hourihane
afa05e68b8 Enable line stippling. 2005-01-14 16:56:52 +00:00
Keith Whitwell
4ccee80190 Fix previously un-noticed issue with flat-shaded points. 2005-01-14 15:03:00 +00:00
Alan Hourihane
faf96a157d silence a warning 2005-01-14 13:11:34 +00:00
Alan Hourihane
42cfcce8d4 Get PolygonStipple working.. (or seemingly too). It seems to do the right
things now given the demos I've used and passes glean's paths test.
2005-01-14 13:10:50 +00:00
Alan Hourihane
38595eda39 16bpp doesn't support masked clears, so fallback when they're enabled. 2005-01-14 13:02:53 +00:00
Keith Whitwell
96d375c682 Populate WriteMonoDepthSpan in 24/8 modes. 2005-01-14 13:01:21 +00:00
Daniel Borca
404273ad09 changed coding style. made `glutTimerFunc' less accurate, but far more reliable. 2005-01-14 08:50:08 +00:00
Daniel Borca
0c68589673 changed coding style. added possibility to use default timer instead of PC/HW timer. 2005-01-14 08:44:29 +00:00
Daniel Borca
aa7a27b38e changed coding style. added a NULL pointer check. 2005-01-14 08:40:43 +00:00
Daniel Borca
7da875d55f changed coding style 2005-01-14 08:37:20 +00:00
Daniel Borca
f4bff83c32 doc update 2005-01-14 08:31:50 +00:00
Vladimir Dergachev
52f5ff525b Remove redundant register.
Hook up some functions in r300Enable().
2005-01-14 06:39:14 +00:00
Vladimir Dergachev
517ac1bf25 Reduce amount of stderr output.
Switch to using R300_EASY_TX_FORMAT() macro everywhere.
2005-01-14 05:26:17 +00:00
Vladimir Dergachev
2821b05a0f Incorporate latest data from Wladimir van der Laan. 2005-01-14 04:21:55 +00:00
Vladimir Dergachev
d2001bd88f Sync with master copy. 2005-01-13 23:13:52 +00:00
Dave Airlie
f11d6d4cb4 add -DUSE_EXTERNAL_DXTN_LIB=1 so compressed textures are enabled for solo 2005-01-13 22:38:21 +00:00
Alan Hourihane
288114b9db remove some dead texture code 2005-01-13 17:53:01 +00:00
Felix Kuehling
a7ab2b2e0b Make sure DMA buffers are released in savageDestroyContext. Usually
the DRM would reclaim DMA buffers, but if one process creates and
destroys many contexts it can still run out of DMA buffers.
2005-01-13 16:02:05 +00:00
Keith Whitwell
b1d322a1e7 Fix loop for quads-as-triangles. 2005-01-13 15:58:05 +00:00
Keith Whitwell
c06f8cb9e5 Rename via_fastrender_* to avoid confusion with similar functions in
via_render.c.
2005-01-13 15:49:39 +00:00
Keith Whitwell
a0371b0b3c Simplify viaChooseVertexState slightly. 2005-01-13 14:57:34 +00:00
Keith Whitwell
d9af44f358 Remove misleading comment. 2005-01-13 14:54:44 +00:00
Keith Whitwell
edd21a6f72 Typo 2005-01-13 14:52:24 +00:00
Keith Whitwell
db19ae89f2 Emit constant colors for texunit 1 blending.
Change comments and some code to match naming used in the docs.
2005-01-13 14:38:17 +00:00
Michal Krol
436f4bbd62 add s_atifragshader.c, s_atifragshader.h 2005-01-13 14:15:36 +00:00
Michal Krol
7f3e2dac7a 3dlabs glslang frontend 2005-01-13 14:14:55 +00:00
Michal Krol
302a414b34 3dlabs glslang frontend, not complete 2005-01-13 14:14:11 +00:00
Michal Krol
01d38cdf0c cosmetic changes 2005-01-13 14:13:19 +00:00
Michal Krol
6324f73b93 implement ARB_shader_objects, not complete 2005-01-13 14:12:50 +00:00
Michal Krol
8b7cc45f3d add atifragshader.c, shaderobjects.c, shaderobjects_3dlabs.c, atifragshader.h,
shaderobjects.h, shaderobjects_3dlabs.h
2005-01-13 14:12:01 +00:00
Michal Krol
b05e75bf69 add shaderobjects_3dlabs.c 2005-01-13 14:10:37 +00:00
Michal Krol
3d52858c78 add ARB_shader_objects interfaces, shared and context state 2005-01-13 14:09:58 +00:00
Michal Krol
0e85388ba8 enable ARB_fragment/vertex_shader 2005-01-13 14:09:18 +00:00
Michal Krol
9b3752c8ab init ARB_shader_objects subsystem 2005-01-13 14:08:47 +00:00
Michal Krol
8f8534f691 add shader/shaderobjects_3dlabs.c 2005-01-13 14:08:00 +00:00
Keith Whitwell
df14522540 cut out dead texture state code 2005-01-13 13:00:23 +00:00
Alan Hourihane
5bd6a5f2df revert some makecurrent code 2005-01-13 12:03:00 +00:00
Alan Hourihane
db93e6165e Fix glean scissor test 2005-01-13 10:20:16 +00:00
Vladimir Dergachev
d4330fc322 Prevent "disabling 3D acceleration" message from printing - we do not define raster functions anyway. 2005-01-13 09:08:58 +00:00
Vladimir Dergachev
d456ef48e5 Incorporate TX_FORMAT information contributed by Wladimir van der Laan.
Attempt to use it in r300_state.c
We are still missing something and the formats do not quite work.
Perhaps something in texture management code ?
2005-01-13 09:05:31 +00:00
Alan Hourihane
3ff4eca05c As we fallback for polygon stipple on the CLE266 for now, ensure we
don't turn on the polygon stipple hardware bit.
2005-01-13 00:15:28 +00:00
Alan Hourihane
cce4d5cb70 Use the faster span read/write template for 16bpp 2005-01-12 23:16:28 +00:00
Keith Whitwell
88440d2d75 Don't special-case 16bpp for colormask register - not needed. 2005-01-12 21:55:47 +00:00
Keith Whitwell
8e5281fbe1 Simplify usage of drmHash functions and fix bug in
__driGarbageCollectDrawables which would get confused while walking
the hash values.
2005-01-12 21:04:03 +00:00
Keith Whitwell
0aca086f7a free buffer in t_vertex_c.c on context delete 2005-01-12 19:38:41 +00:00
Keith Whitwell
8e46534b3b Remove bogus write to freed memory (valgrind). 2005-01-12 19:27:49 +00:00
Alan Hourihane
118b82145a Check for deletion of currently bound context
Other minor cleanups
2005-01-12 19:24:39 +00:00
Keith Whitwell
f9b89910d1 new test to exercise context and window create/delete 2005-01-12 19:11:47 +00:00
Alan Hourihane
7ea2084513 Fixes lockups initializing AGP DMA. 2005-01-12 18:32:51 +00:00
Keith Whitwell
4676a6ab7b Expand out the N(x) macro so that tags can find functions like
drmHashFirst(), etc.
2005-01-12 18:14:42 +00:00
Alan Hourihane
2937d403db build fixes and enable agp dma 2005-01-12 17:33:09 +00:00
Keith Whitwell
708e25142b Add flag to clear texture caches after texture upload. 2005-01-12 17:20:29 +00:00
Keith Whitwell
5ba7d85fea Don't emit HC_SubA_HSPXYOS on CLE266. 2005-01-12 17:20:08 +00:00
Keith Whitwell
09ac1d1125 Allow two GL primitives to be combined to one HW primitive
if possible.
2005-01-12 13:33:27 +00:00
Alan Hourihane
26dcb88fb9 Fix multitexturing.
The multiarb test works now when disabling texunit0/1.
2005-01-12 12:45:42 +00:00
Daniel Borca
a9531eb2c5 some "safer" type-punning (gcc optimizes float moves with integer moves, anyway). 2005-01-12 09:25:37 +00:00
Brian Paul
d7b837ad4a temporary prototypes for OpenGL 2.0 2005-01-12 04:06:55 +00:00
Brian Paul
2a34e66d6a OpenGL 2.0 StencilFunc/Op/MaskSeparate functions 2005-01-12 04:01:54 +00:00
Brian Paul
a9e34c68ac Some initial work for OpenGL 2.0: glStencilFunc/Op/MaskSeparate() functions. 2005-01-12 04:01:08 +00:00
Ian Romanick
591b72b6a9 Added a couple missing proxy types. 2005-01-11 23:50:01 +00:00
Aapo Tahkola
ff04e50e2e Mipmapping and other texture filters now work.
Beaware that R300_TX_MIN_FILTER_MASK might be incorrect because i havent
been able to confirm that all filters operate correctly. Because of this its
also pretty pointless trying to get other features that use filter field to
work.

Lod bias should also work but have been unable to test it because lodbias
test doesnt work.
2005-01-11 23:34:55 +00:00
Ian Romanick
d24e49f301 Put quotes around the CC and CXX variables passed to mklib. This make
them work with multi-work compiler names (e.g., "ccache gcc").
2005-01-11 22:43:45 +00:00
Alan Hourihane
5b28844dba fix a typo 2005-01-11 18:43:21 +00:00
Keith Whitwell
3bd6e3d532 Disable bogus pbuffer code (though this could be revived with a little
attention).
Correctly advertise FBConfigs with GL_BGRA rather than GL_BGR.
2005-01-11 17:12:48 +00:00
Alan Hourihane
5b5e6cc120 Fix the calculation of the alpha reference value which negates the
need for the big nasty fallback - so I've commented out that code.
2005-01-11 17:09:47 +00:00
Keith Whitwell
aac4d8857a Temporarily disable pageflipping assert. 2005-01-11 17:06:09 +00:00
Alan Hourihane
8e039bf40a uncomment 2005-01-11 16:44:18 +00:00
Alan Hourihane
f29aaf80a4 Fix ColorMask 2005-01-11 16:42:56 +00:00
Brian Paul
cdb6541634 prototype _mesa_init_ati_fragment_shader() 2005-01-11 15:56:47 +00:00
Michal Krol
43343913b9 aliasing was broken 2005-01-11 15:47:16 +00:00
Keith Whitwell
b13eaf2698 Add a big nasty fallback for AlphaTest -- seems to always be wrong
on CLE266 because Z values are written even for fragments which
fail the test.
2005-01-11 15:40:06 +00:00
Alan Hourihane
51365b2d0d fallback on polygon.stippleflag (thanks Keith) 2005-01-11 15:24:24 +00:00
Brian Paul
0275d921ac VMS updates from Jouk Jansen 2005-01-11 15:23:08 +00:00
Daniel Borca
94dd520210 applied Keith's patch for "safe" type-punning.
made IS_NEGATIVE produce a boolean (useful when xoring with other booleans).
2005-01-11 10:56:39 +00:00
Alan Hourihane
5358682aa7 Fix usage of texture units, when TEX1 is enabled, but not TEX0. 2005-01-11 09:52:10 +00:00
Vladimir Dergachev
0cb0a36d8c Get NeHe lesson08 to work. Note: it appears the filtering does not work properly. Need to find place where it is broken and put an fprintf() complaining about it. 2005-01-11 06:22:55 +00:00
Vladimir Dergachev
d5432ac584 Switch back to using immediate mode code - use of AGP space is interfering with texture management.
Ideally, r300_render is ready to be rewritten to use standard Mesa include files, but I don't think I'll get around to it.
2005-01-11 05:59:07 +00:00
Vladimir Dergachev
864137984a Move the few definitions from r300_lib.h still in use to r300_emit.h.
Rework *vb* function to not use AOS_ARRAY structure, but rather work directly with r300->state.aos.
Remove references to r300_lib.h and r300_lib.c
Remove r300_lib.[c,h].
2005-01-11 04:11:05 +00:00
Vladimir Dergachev
086ca3dffb Switch r300_state.c to use r300_fixed_pipelines.h instead of r300_lib.h.
This fixes potentially buggy memcpy()'s between potentially different structures.
2005-01-11 03:55:04 +00:00
Vladimir Dergachev
dd4837502c Copy sample pixel and vertex shaders to r300_fixed_pipelines.h 2005-01-11 03:50:04 +00:00
Brian Paul
14e98b7d7c remove a debug line 2005-01-10 23:16:49 +00:00
Brian Paul
ff53a4ee13 tweak output formattting, fixed uninitialized var error 2005-01-10 23:15:59 +00:00
Felix Kuehling
86f1439f82 Fixes to cope with the lack of AGP textures. This is all that's needed
to support PCI Savages on the Mesa side. Bumped driver date.
2005-01-10 22:49:00 +00:00
Alan Hourihane
9db66a3f9f Fallback on PolygonStipple for CLE266 hardware.
Only upload stencil configuration when a stencil buffer exists.
2005-01-10 19:44:59 +00:00
Brian Paul
eaf2b170ff Windows/ReactOS patch (Gregor Anich) 2005-01-10 16:23:21 +00:00
Keith Whitwell
574f3c7daf More changes to cope with color stride == 0 2005-01-10 14:36:25 +00:00
Keith Whitwell
a887a44b2d Fix segfault in pipes by dealing with stride == 0 case in generic_interp_extras 2005-01-10 12:30:08 +00:00
Vladimir Dergachev
8c231d2e28 Bring vertex buffer code up to date.. 2005-01-10 05:24:28 +00:00
Vladimir Dergachev
6867117b58 For some reason we need r300Flush when using textures. Perhaps the problem is
with BITBLT_MULTI call ?
2005-01-10 03:42:50 +00:00
Vladimir Dergachev
5f61c6f21f Clean up the code and make it unnecessary to issue extra calls to Setup*Shaders
in the r300_run_immediate_render function.
Bumps up glxgears fps count by about 100 points.
2005-01-10 03:22:54 +00:00
Vladimir Dergachev
8ad31013b2 Port EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c. 2005-01-09 23:37:03 +00:00
Vladimir Dergachev
e9acd0ca5f Implement a more elaborate hashing scheme for texture formats. Still not perfect.
Transform EmitVertexShader in cmdbuf.c to SetupVertexShader in state.c.
The latter is only temporary and is to be rewritten to auto-generate shaders based on current GL context.
2005-01-09 22:38:53 +00:00
Brian Paul
527af7571e minor readtex fixes 2005-01-09 18:05:02 +00:00
Brian Paul
612bf1fa2e improved animation rate 2005-01-09 18:00:49 +00:00
Brian Paul
7a663b315e rotate at fixed rate, changed fire effect (Marcelo Magallon) 2005-01-09 17:52:48 +00:00
Brian Paul
a00c591511 rotate at fixed rate (Marcelo Magallon) 2005-01-09 17:50:27 +00:00
Brian Paul
a4a31c5d76 use #ifdef to test for extension 2005-01-09 17:39:36 +00:00
Brian Paul
2d84ed83c4 include readtex.h 2005-01-09 17:39:06 +00:00
Brian Paul
92eddb0fd4 better animate rate (Marcelo Magallon) 2005-01-09 17:37:50 +00:00
Brian Paul
516f9bc6e3 some new/improved rules 2005-01-09 17:26:08 +00:00
Brian Paul
575d24a5ff include readtex.h instead of readtex.c 2005-01-09 17:15:41 +00:00
Brian Paul
0fe7f406be include readtex.h instead of readtex.c (Marcello Magallon) 2005-01-09 17:06:22 +00:00
Brian Paul
b58091a336 Add #ifdefs for extension testing (Marcello Magallon) 2005-01-09 17:00:57 +00:00
Brian Paul
429efa9f00 animation rate patch (Marcello Magallon) 2005-01-09 16:52:53 +00:00
Brian Paul
1b058a06c2 rotate at a reasonable rate 2005-01-09 16:48:52 +00:00
Brian Paul
c1065ee977 compute reasonable animate rate (Marcelo Magallon) 2005-01-08 23:52:01 +00:00
Brian Paul
0261042beb fix-up rules for sphere demo, which uses readtex utility 2005-01-08 23:51:50 +00:00
Felix Kuehling
b45ce5c607 * Flush and wait in per-primitive fallback functions. Fixes flickering
stars in glplanet.
* Refactored vertex format choosing code. Improved the Savage4 version
  to choose a format suitable for DMA (size = 32bytes) whenever
  possible.
2005-01-08 23:39:19 +00:00
Felix Kuehling
e4499ed276 Added missing break; to fix infinite recursion between choose_emit_func
and emit_viewport4_bgra4_st2_st2.
2005-01-08 15:51:11 +00:00
Felix Kuehling
675b92515a Added state debugging option (SAVAGE_DEBUG=state).
Fixed: Use savageEmitChangedRegs instead of savageEmitContiguousRegs for
emitting Savage4.
2005-01-08 15:03:25 +00:00
Adam Jackson
1074eae704 Enable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet). 2005-01-08 03:54:38 +00:00
Adam Jackson
ccaa15a081 Parallel build fix. Multiword variables on the target side of a : get
expanded into individual rules for each word, so parallel builds will
start multiple instances to create the server/ symlinks and fail when they
already exist.
2005-01-08 03:16:04 +00:00
Keith Whitwell
f1481aa2d7 Add t_vb_cull.c (Bernard Blackham) 2005-01-07 18:35:28 +00:00
Keith Whitwell
f0e4f5e556 And fix the obvious bugs in higher-numbered templates. 2005-01-07 16:43:39 +00:00
Keith Whitwell
ae73b3d5ed Templatize the fastpaths. 2005-01-07 16:25:40 +00:00
Keith Whitwell
fa1362241b Add some more hardcoded fastpaths. 2005-01-07 15:54:48 +00:00
Keith Whitwell
5fff0c135d Cope with the possibility that incoming vectors may have
count < VB->Count.

Remove code to deal with the (should-be) impossible situation of null
input vectors.
2005-01-07 15:27:41 +00:00
Keith Whitwell
5911d87315 Use the 'to' vector to determine the loop count. 2005-01-07 15:26:02 +00:00
Keith Whitwell
e0be62e2c5 Remove -C flags for install which aren't universally supported. 2005-01-07 15:24:59 +00:00
Felix Kuehling
85243b8120 Fixed: ptex drawing functions were overridden with standard drawing
functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set.
2005-01-07 10:55:13 +00:00
Keith Whitwell
b3d772bd9a Add a clean target to remove generated files. 2005-01-07 10:36:14 +00:00
Keith Whitwell
5cd24d4dc2 Add a noop install target 2005-01-07 10:35:51 +00:00
Keith Whitwell
8764441b58 Improve the semantics of the 'install' target to make sure the right
file is really being installed.  Useful if you have multiple versions
of a single driver directory hanging around and want to switch between
them for testing.
2005-01-07 10:35:23 +00:00
Keith Whitwell
000dd4afe2 Add an install target 2005-01-07 10:34:13 +00:00
Keith Whitwell
1837dda4d8 Make clean in the x86 directory.
Propogate 'install' target down to dri driver directory.
2005-01-07 10:34:00 +00:00
Ian Romanick
a11659adaf Use GNU AS label aliasing, if available. This must be enabled by adding
'-DHAVE_ALIAS' to DEFINES in the config file used for building.  On the
linux-dri-x86 build, this cuts 4KB from libGL.so.  HAVE_ALIAS is not
currently enabled in any of the configs.
2005-01-07 03:41:48 +00:00
Ian Romanick
0f34f3efb8 Script to generate rough GLX protocol documentation (as might be seen in
an extension spec).  It's not perfect, and it doesn't support certain
functions that other scripts here can (e.g., pixel functions).  However,
it is a good start and has already proven useful to me.
2005-01-07 03:23:59 +00:00
Ian Romanick
a285acbbef Track the GLX protocol names for GL types. 2005-01-07 03:22:56 +00:00
Ian Romanick
70d2f152f8 Refactor the code that converts a transpose-matrix enum to a
regular-matrix enum.
2005-01-07 02:53:04 +00:00
Ian Romanick
5f1f229f8d Pixel oriented render functions are now generated by the
glX_proto_send.py script.  This eliminates ~600 lines of non-generated
code.  With proper compiler optimization settings, it also decreases the
size of libGL.so by about 3KB.
2005-01-07 02:39:09 +00:00
Ian Romanick
3385d7cec3 The generic_*_byte functions did not rount the command size to a
multiple of 4 correctly in some cases.
2005-01-07 02:29:42 +00:00
Brian Paul
ba5ceda7e0 added GetAllFBConfigs() 2005-01-07 01:17:42 +00:00
Ian Romanick
7e3379b1a0 Revert some accidental cross-merge changes. Remove i915GetString. Migrate
a couple extensions that appeared in both device-specific card_extensions
strings to the shared one.
2005-01-07 00:48:24 +00:00
Brian Paul
71fc6a3fc9 New GetAllFBConfigs() function. Some FBConfigs weren't reported before. 2005-01-06 23:59:37 +00:00
Brian Paul
1f98ee9022 In choose_visual() we need to know if we're being called from
glXChooseVisual() or glXChooseFBConfig() so that we handle the
GLX_DOUBLEBUFFER and GLX_STEREO tokens correctly.
Added some new error checking in those functions too.
2005-01-06 21:56:16 +00:00
Aapo Tahkola
8bb717d2d5 Add radeon 9550 pci id. 2005-01-06 19:26:25 +00:00
Keith Whitwell
a61ee65910 Redraw on keypress, as apparently intended. 2005-01-06 17:12:56 +00:00
Alan Hourihane
a2db56b34b Add Intel i915GM support, and these extensions.
* GL_ARB_texture_cube_map
* GL_EXT_blend_equation_separate
* GL_ATI_blend_equation_separate
* GL_ARB_point_parameters
* GL_NV_blend_square
* GL_EXT_cull_vertex
* GL_ARB_depth_texture
* GL_SGIX_depth_texture
* GL_ARB_shadow
* GL_EXT_shadow_funcs
* GL_3DFX_texture_compression_FXT1
(Keith Whitwell, Tungsten Graphics)
2005-01-06 14:35:44 +00:00
Daniel Borca
9f149bf206 semantic in parameter names 2005-01-06 14:34:48 +00:00
Daniel Borca
d401faf877 semantic in parameter names. changed emitter function. 2005-01-06 14:09:18 +00:00
Thomas Hellström
4c1d373ce1 Small Unichrome fixes:
1. Unlock hardware before aborting and dumping DMA buffers. Otherwise display system may deadlock.
2. Fix DMA init IOCTL call that got mixed up in one of the previous commits.
3. Fix AGP command alignment
2005-01-06 13:51:37 +00:00
Daniel Borca
dd1ef7c0d7 semantic in parameter names 2005-01-06 07:46:37 +00:00
Daniel Borca
5135d37813 solved classic "char*" vs "char[]" conflict. we were mimicking a pointer variable at desired location and then we took its address. using array is more intuitive, as they give us the starting address instantly. 2005-01-06 07:45:17 +00:00
Daniel Borca
ed1fc20199 protected against elfish directives 2005-01-06 07:40:33 +00:00
Daniel Borca
9b7367154b semantic in parameter names 2005-01-06 07:38:28 +00:00
Daniel Borca
994d5cc5f4 removed detritus 2005-01-06 07:37:32 +00:00
Daniel Borca
7047cb08eb added "default" branch in `convertPalette' 2005-01-06 07:36:56 +00:00
Daniel Borca
50122c9d2d fix dstRGB factor 2005-01-06 07:35:46 +00:00
Vladimir Dergachev
e09c843c13 Turns out the kfountain.kss (as well as lesson19) had a bug - the size was set wrong. Fixed. 2005-01-06 04:39:51 +00:00
Vladimir Dergachev
91538b4432 Add texture format to get lesson19 working again. 2005-01-06 04:02:52 +00:00
Vladimir Dergachev
dbc125eede Switch to a more complicated scheme of choosing texture formats, as it looks
like the old one was prone to collisions (different value of format field was
required for same values of t->format going in).
Now use a hash for these purposes - this got kfiresaver.kss and lesson06 workingfrom the same code.
2005-01-06 03:56:18 +00:00
Ben Skeggs
7b51aa54be Added GL_POLYGON primitive. Single primitive between glBegin()/glEnd() now works. 2005-01-06 00:10:11 +00:00
Felix Kuehling
3e4d4aca77 * Fixed handling of scissors
* Only set scissor regs directly if drmMinor < 1
* Don't set texaddr to 0 when a texture unit is disabled. That would trigger
  the tightened texture state check in the DRM if the texaddr and texdesc
  registers were not emitted atomically.
2005-01-05 23:56:16 +00:00
Alan Hourihane
1e21673ea1 support 720x480 and 960x540 modes 2005-01-05 22:40:34 +00:00
Alan Hourihane
ee2761f2f3 Only try to free the front buffer when it's a pbuffer. 2005-01-05 21:49:52 +00:00
Keith Whitwell
699fc6baf9 Make the format of the fastpaths cleaner at the expense of a little
performance.

Add fastpaths for some more common vertex formats.
2005-01-05 20:56:05 +00:00
Alan Hourihane
609e54820c fix build problem 2005-01-05 20:13:04 +00:00
Keith Whitwell
99fc261c47 Improve some quad paths, gives gears a little boost. 2005-01-05 18:14:38 +00:00
Keith Whitwell
dd9666bc1d Give attributes with zero-stride a count of 1 to make it easier
to avoid transforming the same attribute multiple times.

Don't light a single normal multiple times in light_fast_rgba*
2005-01-05 18:06:05 +00:00
Keith Whitwell
30f6486276 make alloc-dma functions inline, rearrange some debug 2005-01-05 13:51:38 +00:00
Keith Whitwell
830e046972 Avoid a segfault in multiarb.c 2005-01-05 13:51:03 +00:00
Alan Hourihane
e3fe80a60f Bring VIA driver up-to-date with regard to drm_*_t changes and remove
the xf86drmVIA.[ch] files.

Bring in the IRQ handler and Ring buffer code, but ring buffer is disabled
as it is with the Xserver. It certainly locks up the CLE266.
2005-01-05 13:45:09 +00:00
Keith Whitwell
9a8a9fb01f Add a couple of hardwired fastpaths to t_vertex.c. 2005-01-05 12:58:14 +00:00
Keith Whitwell
d5b1605449 If there is only one normal, don't transform it multiple times. 2005-01-05 11:10:05 +00:00
Vladimir Dergachev
380ba2daec Reduce the amount of debug output, while still printing important messages.
Make guessing texture formats easier.
2005-01-05 04:56:23 +00:00
Vladimir Dergachev
e99f390ff6 Play a little bit with texture formats.
Get NeHe demos 06, 07 and 19 working.
2005-01-05 00:18:46 +00:00
Vladimir Dergachev
065f725672 Sync with master copy. 2005-01-04 22:52:53 +00:00
Vladimir Dergachev
6b185aaedf Port code from r200 that implements color blending. Seems to work.
This can be tested with lesson19 from NeHe.
This has also shown that the alpha code does not work - we pick up a red tint
for transparent pixels somewhere.
2005-01-04 20:25:11 +00:00
Vladimir Dergachev
55ee1daaf9 Unify rendering of textured and non-textured primitives. 2005-01-04 19:15:37 +00:00
Vladimir Dergachev
638faa92fc Major code restructuring:
* move proven code into the r300_state.c
  * update ClearBuffer to cope with more dynamic state
  * cleanup !
2005-01-04 18:59:47 +00:00
Brian Paul
85edffd5ff added GLX_NV_float_buffer 2005-01-04 14:48:14 +00:00
Brian Paul
932dee87e3 use HIDDEN macro to export fewer symbols (bug 2210) 2005-01-04 14:33:47 +00:00
Brian Paul
bdbdab837e directfb changes (Claudio Ciccani) 2005-01-04 14:19:25 +00:00
Keith Whitwell
6650264802 Add GL_EXT_fog_coord 2005-01-04 12:57:02 +00:00
Keith Whitwell
31c25f2edc Add GL_EXT_secondary_color 2005-01-04 12:56:17 +00:00
Keith Whitwell
e024cae14b Turn specular lighting state on/off appropriately. 2005-01-04 12:53:41 +00:00
Keith Whitwell
b6ab7a1bf1 Change to use the t_vertex.c mechanisms for building vertices,
including Felix's ptex code.

Re-enable some assembly for performance.
2005-01-04 12:18:05 +00:00
Brian Paul
f72e4424d9 Use the GLX 1.3 pbuffer/fbconfig functions in preference to the SGIX ones.
Added more functions to pbutil.[ch] to better isolate API differences.
2005-01-04 00:58:29 +00:00
Felix Kuehling
e3748eb19b Added support for floating point depth buffers on Savage4-based
hardware. By also reversing the depth range this can compensate the loss
of accuracy of far objects caused by the projective transformation.
Software fallbacks work but are slightly slower since floats in a custom
(non IEEE) format have to be encoded and decoded. I havn't done anything
about polygon offsets yet. There doesn't seem to be an easy way do get
it right except making the offset unit as big as the lowest resolution
of depth values. For now float depth is disabled by default but can be
enabled through driconf (though I have seen only positive effects so
far).
2005-01-03 22:24:44 +00:00
Felix Kuehling
87889aeab4 Added a boolean option for a floating-point depth buffer. 2005-01-03 22:15:41 +00:00
Ian Romanick
3276c192b7 The opcode and command length fields of RenderLarge commands were
mistakenly emitted in the wrong order.
2005-01-03 21:03:03 +00:00
Brian Paul
dd1a817c50 latest updates 2005-01-03 15:55:51 +00:00
Vladimir Dergachev
a5039af357 Add structs describing vertex and pixel shader state to r300_state.
Take apart program_pipeline() and move it into appropriate pieces within the driver.
Test the framework on run_flat_render()
2005-01-03 15:45:10 +00:00
Brian Paul
8e73b14228 bump version to 6.3, etc. 2005-01-03 15:36:27 +00:00
Brian Paul
81ca616e7e DirectFB driver (Claudio Ciccani) 2005-01-03 15:35:00 +00:00
Brian Paul
6563c16e38 updates from Jouk 2005-01-03 15:01:26 +00:00
Vladimir Dergachev
25faa2d56e Turns out I left flat primitives in vertex buffer mode. Switch them back to immediate which works correctly.. 2005-01-03 06:53:38 +00:00
Vladimir Dergachev
63473a8e76 Enable code to compute other constants that were used by R200 code.
Add fprintf to print these constants.
Correct t->size computation, so it works now.
2005-01-03 06:48:50 +00:00
Vladimir Dergachev
2fc9351ee7 Port texture allocation code from R200.
Hook it up, so lesson06 displays red colored textures.
2005-01-03 05:44:20 +00:00
Vladimir Dergachev
63fd67e561 Add texture units registers 2005-01-02 21:53:53 +00:00
Vladimir Dergachev
f50a1964d1 Cleanup !
I can not trigger any lockups now..
2005-01-02 06:16:44 +00:00
Vladimir Dergachev
d6be8dd651 I think I fixed the lockups issue. 2005-01-02 05:57:15 +00:00
Vladimir Dergachev
9a04b25c60 Get textures to work with NeHe lesson06.
The code is still disabled since we are displaying random image data instead of actual texture and because I had to put a sleep(1) in lesson06 drawing loop to prevent lockups.
2005-01-02 04:46:25 +00:00
Adam Jackson
3c80f5c56b linux-dri-x86 build fix from Andreas Stenglein. 2005-01-02 03:36:53 +00:00
Felix Kuehling
7a231da442 Improved the performance of software fallbacks by not waiting for idle
in every single span function. Instead flush and wait in the
SpanRenderStart hook and in wrappers around _swrast_Copy/Draw/ReadPixels.
Misc. cleanups in savagespan.c while I'm there.
2005-01-02 01:22:10 +00:00
Felix Kuehling
1067ce0cea Removed all direct hardware access (MMIO, BCI) from the Savage DRI
driver. It uses the new DRM version 2.0.x now, which has just been
committed to DRM CVS.
2005-01-01 20:40:14 +00:00
Felix Kuehling
467d64a177 Use DRM headers from $(DRM_SOURCE_PATH)/shared-core instead of .../shared. 2005-01-01 20:33:45 +00:00
Vladimir Dergachev
404d925b58 Add a convenience function to issue CP delays. 2005-01-01 18:41:43 +00:00
Vladimir Dergachev
e443d1ec47 Qualify the magic 20B0 register as SE_VTE_CNTL similar to R200. Looks like disabling Z offset and scaling displays gears properly, not sure why. Perhaps the meaning of the bits has changed ?
Cleanup code a bit.
2004-12-31 21:28:36 +00:00
Vladimir Dergachev
92d47e79f1 Sync with master copy. 2004-12-31 20:57:48 +00:00
Vladimir Dergachev
11374bdb86 Add texture drawing code. Note: it is broken at the moment and is disabled in CVS. However, all hooks are there.
Fix vertex buffer drawing code.
2004-12-31 19:39:03 +00:00
Vladimir Dergachev
24b5e49141 Rework slightly r300_get_primitive_type - make it clearer and more compact.. 2004-12-30 20:24:30 +00:00
Keith Whitwell
179cc373f1 Get scissor test working again. Passes glean scissor test. 2004-12-30 17:47:08 +00:00
Keith Whitwell
c664f0c515 Calculate DEPTH_SCALE correctly for polygon offset. 2004-12-30 16:30:26 +00:00
Keith Whitwell
8be4747fd6 Simplify viaBlit a bit more.
Implement masked clears.
2004-12-30 16:13:35 +00:00
Vladimir Dergachev
4a04f002db Add missing files. 2004-12-30 16:06:37 +00:00
Keith Whitwell
8f1ba083ba Initialize depth pointer correctly. 2004-12-30 16:05:07 +00:00
Keith Whitwell
58cc2e9124 Don't need to adjust for drawXoff in fallback clipping. 2004-12-30 15:58:45 +00:00
Keith Whitwell
18551e75ea fix regression with fallbacks from recent commits 2004-12-30 14:32:19 +00:00
Keith Whitwell
6fcc6c4965 Fix MagFilter state for texunit 0 2004-12-30 14:21:46 +00:00
Vladimir Dergachev
bcd1a9ed68 Update vertex buffer code (still does not work properly..) 2004-12-30 11:43:04 +00:00
Vladimir Dergachev
2269445f6d Update to recent r300_lib.
Cleanup code that is not relevant anymore.
Play with unknown2 parameter.
2004-12-30 11:17:42 +00:00
Vladimir Dergachev
b53030a94c Hooked up projection matrix - the gears actually rotate ! 2004-12-30 10:27:04 +00:00
Vladimir Dergachev
a656dc251e Restructure code.
Add drawing code that uses vertex buffers - does not lockup, but does not draw correctly either.. Perhaps something to do with vertices being overwritten ?
Start using hardware state retained by the driver and cut back on direct register writes significantly.
2004-12-30 10:11:39 +00:00
Vladimir Dergachev
51050efe0e Change default RS settings so that glxgears will display something.. 2004-12-30 07:50:15 +00:00
Vladimir Dergachev
7d8c1fb03a Clarify some of the unkXXXX atoms. 2004-12-30 07:11:28 +00:00
Vladimir Dergachev
74bf43051c Port viewport setting code from R200.
Take it outside R300ResetHwState.
2004-12-30 06:06:54 +00:00
Keith Whitwell
5be14fd59a Fix some wrapping bugs in the last commit. Probably there are more
remaining.
2004-12-29 21:17:06 +00:00
Keith Whitwell
490e764d7a Simplfy clear() and swapbuffers() code.
Fix various mishandling of cliprects.
Allow multiple primitives to be emitted to a single dma buffer, which
was largely impossible previously.
Re-enable the fast unclipped render stage.
2004-12-29 20:46:27 +00:00
Keith Whitwell
ef494c06b6 Use Point._Size in calculation 2004-12-29 14:38:17 +00:00
Keith Whitwell
54ef88109b use clamped Line._Width in calculations 2004-12-29 14:36:58 +00:00
Keith Whitwell
e158292ee3 Don't advertise wide lines or points. 2004-12-29 14:09:21 +00:00
Keith Whitwell
e972497310 Make line stipple a fallback.
Make sure fallbacks are wrapped by SpanRenderStart/SpanRenderFinish
2004-12-29 14:06:09 +00:00
Keith Whitwell
f102f7ae3d Don't pingpong cliprects through sarea on CopyBuffer(). 2004-12-29 14:05:16 +00:00
Keith Whitwell
cb0cc796d2 Fallback on 3d textures correctly. 2004-12-29 13:03:12 +00:00
Keith Whitwell
3b486d795d Get twoside-lit triangles working again 2004-12-29 12:48:50 +00:00
Keith Whitwell
13ae06cf36 Large update
- Remove via duplicates of shared template files
	- Update driver to work with current versions of the above
	- Rework dma accounting
	- Rework emitting to dma to use a consistent set of macros

The handling of cliprects in the driver is still pretty questionable.
2004-12-29 12:39:50 +00:00
Vladimir Dergachev
7b05b70c2a Rearrange code so we don't dump state as often. 2004-12-29 04:51:46 +00:00
Vladimir Dergachev
4c3f041862 Get most primitives working using immediate mode.
Glxgears displays "rotating" gears, all in the same place (no transform mode, remember ?)
Work needs to be done to understand how to have glxgears working properly.
2004-12-29 04:33:33 +00:00
Vladimir Dergachev
5bdb4652f9 Bring in latest revision of r300_lib.
New capabilities: using vertex buffers, immediate vertex data, immediate indices.
2004-12-29 03:48:05 +00:00
Vladimir Dergachev
6a50fc43cb Use R300_CMD_END3D for end_3d(). 2004-12-27 23:30:39 +00:00
Adam Jackson
c6cca6a3b8 Fix read-from-uninitialized in s3vMakeCurrent() 2004-12-27 22:57:05 +00:00
Adam Jackson
29c88396db Unused variable cleanup. 2004-12-27 22:08:34 +00:00
Adam Jackson
d9fcfa2797 Bug #1859: Initialize 'size' before first use in intelTryReadPixels() 2004-12-27 21:52:17 +00:00
Adam Jackson
0983c9dd99 Build s3v and trident by default too.
Smoky the bear says: Only you can prevent bitrot.
2004-12-27 20:38:29 +00:00
Adam Jackson
c3eaa17b37 Get s3v building with a minimum of warnings. 2004-12-27 20:31:56 +00:00
Vladimir Dergachev
99edafd4e8 Implement rendering of (flat color) QUAD primitives as an experiment. 2004-12-27 17:18:48 +00:00
Ian Romanick
83fcf49647 Fixed two problems with the handling of GLX protocol replies. The logic
for determining when extra data needed to be read after a reply (to ensure
4-byte alignment) and the logic to determine whether or not to read reply
data after the SingleReply packet were both slightly wrong.
2004-12-27 08:29:54 +00:00
Vladimir Dergachev
3cbc2bd833 Expose primitive types being rendered, in preparation to implement fixed pipeline primitive drawing.
Note: these are only visible when export LIBGL_DEBUG=verbose is specified.
2004-12-26 21:42:14 +00:00
Vladimir Dergachev
1b2a655521 Update with most recent version. 2004-12-26 19:32:21 +00:00
Adam Jackson
46a35b2284 Get trident building and -Werror clean.
- Added Makefile
- Deleted references to old headers
- Added prototypes all over the place
- Lots of type updates (drmHandle -> drm_handle_t etc.)
- Added __driCreateNewScreen(), deleted __driCreateScreen()
- Fixed context creation to match other drivers
- Fixed various bitfield names
- Bumped driver date

Still nowhere close to usable, the DDX isn't DRI-aware and there's no DRM.
2004-12-24 03:04:14 +00:00
Felix Kuehling
1c86c7ad9c Simplified and optimized _savage_texnorm_stage. 2004-12-23 20:26:59 +00:00
Keith Whitwell
3deaf21745 Remove the VIA_PERFORMANCE code. A step towards moving the driver
back to using the shared template files.
2004-12-23 18:26:40 +00:00
Keith Whitwell
9876730f7a Chop out more dead code.
Get the drawXoff adjustment working a bit better.
Seems to pass the glean orthoPos tests.
2004-12-23 18:16:22 +00:00
Keith Whitwell
15da29b5e7 Fix merge error. 2004-12-22 19:31:10 +00:00
Keith Whitwell
7db50bb3a8 Remove dead code.
Fix 24/8 depth/stencil visuals.
2004-12-22 19:30:02 +00:00
Felix Kuehling
922bfd70ff Enabled hardware rendering of 1D textures. No need for a software fallback. 2004-12-22 16:12:59 +00:00
Felix Kuehling
80dd3c7917 - Fake projective textures on a single texture unit. A fallback is only
needed if a second texture unit is enabled.
- Also worked around an application bug in Chromium B.S.U.: it sends 3D
  texture coordinates while only a 2D texture is enabled. This used to
  trigger a PTEX fallback. Now the 3rd coordinate is just ignored.
- Fixed the _savage_texnorm_stage to never normalize homogenous texture
  coordinates.
2004-12-22 00:21:32 +00:00
Keith Whitwell
8bdaa927eb Remove debug code which referenced an old global variable. 2004-12-21 23:07:13 +00:00
Ian Romanick
990dec7ea0 Used GCC's __builtin_expect when available. Change the way code is
generated for commands that can use RenderLarge packets.  Tweak the code for
__glXFlushRenderBuffer slightly.
2004-12-21 23:06:02 +00:00
Keith Whitwell
302c5694c6 Push a number of global variables into the viaContext struct.
Remove the bogus 'current_vmesa' pointer.
2004-12-21 22:42:00 +00:00
Ian Romanick
1d27084043 Added some comments and fixed typeos. Slightly refactored the way
function parameters are iterated.  There are no changes in the generated
code.
2004-12-21 21:26:36 +00:00
Daniel Borca
b756990b84 t' was not initialized (use texture' instead?) 2004-12-21 15:45:41 +00:00
Brian Paul
3ec0631e95 fix bug in _mesa_IsTexture() 2004-12-21 15:13:41 +00:00
Keith Whitwell
50694eeff9 Note that state is dirty on contended lock. Allows two applications
to run together correctly, though scheduling between them still isn't
great.
2004-12-21 13:23:10 +00:00
Keith Whitwell
3955313e7c Add missing swap-control calculations.
Remove debug printf.
2004-12-21 12:35:04 +00:00
Keith Whitwell
314f8e4d9d Add vsync swapbuffers. This waits on the irq so gears run in this mode
will have a very low cpu utilization (and also a very low framerate).

Fix up the pageflipping code.  This works now but is totally oblivious
to the X server (ie. it works but it's broken).  Turned off by a #define.
2004-12-21 11:57:03 +00:00
Daniel Borca
91a04617c4 added GL_EXT_stencil_two_side (yes, it works) 2004-12-21 08:21:52 +00:00
Daniel Borca
d7b9d6046d missing `or' in preprocessor conditional 2004-12-21 08:05:43 +00:00
Keith Whitwell
16db15718d Add a -fullscreen option 2004-12-20 14:48:19 +00:00
Keith Whitwell
14bc684990 Remove #ifdef DEBUG's in code, but still allow compiler to remove debug
code if DEBUG not defined.
2004-12-20 12:52:21 +00:00
Daniel Borca
b51600716e put back clipmask code; it proved to be a MinGW/gcc 3.3.x error in t_vb_cliptmp.h(47), where it would still send clipped vertices to the hw... oh, dear... 2004-12-20 08:24:10 +00:00
Daniel Borca
6bb1be010e use float constants.
fixed a small debug error.
2004-12-20 08:20:39 +00:00
Daniel Borca
7799294459 removed ifdef'ed out code (to whom it may concern: it can be found in dri/tdfx driver) 2004-12-20 08:19:28 +00:00
Daniel Borca
16d4166d14 removed detritus (ncc). 2004-12-20 08:18:19 +00:00
Daniel Borca
7b50d773d3 comment reorg.
removed detritus (ncc).
2004-12-20 08:17:36 +00:00
Daniel Borca
ad149e3e65 made some functions static. 2004-12-20 08:16:24 +00:00
Daniel Borca
9e821269fc comment reorg.
made some functions static.
hide vp behind an envvar.
removed unnecessary multitex constraint for napalm hw.
2004-12-20 08:15:50 +00:00
Daniel Borca
6a7b4690e3 allow greater swappendingcount for older hw (v1/v2) 2004-12-20 08:12:09 +00:00
Daniel Borca
00b7aba567 misc cleanup 2004-12-20 08:09:25 +00:00
Daniel Borca
0d7da6c3e0 allow ARB vp/fp query program errors 2004-12-20 08:08:15 +00:00
Daniel Borca
2982dce27e really protect against npot compressed textures (logbase2 never returns -1). 2004-12-20 08:03:01 +00:00
Ian Romanick
0d84c68313 Use GLX protocol code generated by glX_proto_send.py. 2004-12-20 04:53:00 +00:00
Ian Romanick
46be433c47 No GLX protocol for GL_ATI_fragment_shader. 2004-12-20 04:47:46 +00:00
Vladimir Dergachev
55fb41ade8 Fix cut and paste error (reported by Jerome Glisse) 2004-12-19 15:39:40 +00:00
Dave Airlie
7f752fed99 Implement software ATI_fragment_shader
no error detection, slow, may not be 100% correct but a good start
2004-12-19 03:06:59 +00:00
Brian Paul
a803b0c891 Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span(). 2004-12-18 22:03:07 +00:00
Brian Paul
feac302567 added GL_ARB_pixel_buffer_object extension string 2004-12-18 16:19:08 +00:00
Brian Paul
2a5afe3ab8 Added PRINT instruction for GL_NV_fragment_program. 2004-12-18 16:18:00 +00:00
Thomas Hellström
6cec977773 Unichrome DRI driver:
Fix for proplem where polygons partly outside the drawing window would get
one vertex clamped to the opposite window side. This bug could also cause
a hardlock. (Bugzilla #2066, Yann Vernier)
2004-12-18 12:16:12 +00:00
Felix Kuehling
3d04879801 Made debugging output controllable via environment variable
SAVAGE_DEBUG. Added fallback debugs. Added no_rast option to disable
hardware rasterization (everything as software fallback).
2004-12-17 15:55:17 +00:00
Brian Paul
538541e300 VMS update 2004-12-17 14:48:00 +00:00
Daniel Borca
cf95169542 fxRasterPrimitive wasn't always receiving the reduced primitive 2004-12-17 10:40:32 +00:00
Daniel Borca
02978f1092 fxRasterPrimitive wasn't always receiving the reduced primitive 2004-12-17 08:08:37 +00:00
Felix Kuehling
0d39c4ebc9 Added a TNL pipeline stage that normalizes texture coordinates as a
workaround for bad Savage hardware interpolation of big texture
coordinates.
2004-12-17 00:01:15 +00:00
Adam Jackson
c403bcb8a7 Import s3virge and trident drivers. Not functional yet; no Makefile, no DRI-aware DDX. 2004-12-16 19:26:23 +00:00
Brian Paul
8662c5d98f fix typos in texcoord setup - fixes perspective correction bug 2004-12-16 17:33:36 +00:00
Vladimir Dergachev
7771c92d35 The types uint32_t and uint8_t are not used in Mesa tree.
Put a couple of defines to use GL counterparts.
2004-12-16 14:04:49 +00:00
Brian Paul
575700fbdc Experimental PRINT instruction for NV_vertex_program.
Basically, this lets you put a "PRINT 'mesage', register;" statement in a
vertex program to aid in debugging.
2004-12-16 03:07:18 +00:00
Brian Paul
c75900e7a2 don't divide texcoords by q if using a fragment program 2004-12-16 02:14:19 +00:00
Adam Jackson
d16aa9859c Also PUBLICize the config option table 2004-12-16 00:23:47 +00:00
Adam Jackson
3d7aec70c9 Mark __driCreateNewScreen PUBLIC 2004-12-15 23:26:49 +00:00
Adam Jackson
791ce02244 _glapi_* is effectively PUBLIC API for the DRI drivers. 2004-12-15 23:14:29 +00:00
Adam Jackson
4890f2605e Mark the XF86DRI client-side extension API as PUBLIC. 2004-12-15 23:07:55 +00:00
Adam Jackson
2719b54f53 fxt1_decode_1() needs to be non-static for the tdfx and glide drivers. 2004-12-15 22:57:59 +00:00
Thomas Hellström
20456d6a3d Unichrome DRI:
Updated the driver to the new VIA security mechanisms in DRM. All command
submissions now passes through DRM ioctls. If the DRM AGP ring-buffer is
not enabled, it will use a DRM mechanism for submitting commands to the
hardware via a PCI bus mechanism.

Removed all direct write accesses to the hardware. Among other things the
VQ was previously turned off for the PCI path, apparently for Tuxracer.
That seemed unneeded and was removed. No visible impact on Tuxracer.

Abstracted all buffer blit operations in via_ioctl.c. The blitter context
is now reprogrammed before each blitting operation.

Updated driver date and drm version requirement.
(Bugzilla Bug #1950, Thomas Hellstrm)
2004-12-15 21:59:25 +00:00
Thomas Hellström
b4f58e99eb Unichrome DRI:
Stop the driver from giving empty texture levels with erroneous HW addresses
to the hardware. These will get caught and rejected in the DRM command
verifier.
2004-12-15 21:27:49 +00:00
Thomas Hellström
de541439d3 Unichrome DRI:
Fixed an apparent race condition during locking and drawable info updating,
the result of which was the DRI client leaving traces on the screen rendering
where the drawable previously had been.
If the driver hangs X for a second or so and then restarts, this is probably
the place to look. (Thomas Hellstrm)
2004-12-15 21:17:51 +00:00
Thomas Hellström
a47c4c37ce Unichrome DRI driver:
Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol)
Reenabled AGP textures (Thomas Hellstrm)
2004-12-15 21:05:26 +00:00
Felix Kuehling
58f5b91b1b Added configuration support to the Savage driver. Three options are
supported so far.
2004-12-15 17:45:23 +00:00
Adam Jackson
489ccef398 Fix up glx/x11 to work when built with -fvisibility=hidden. 2004-12-15 17:18:06 +00:00
Felix Kuehling
5566127701 Fixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMP
instead of GL_REPEAT.
2004-12-15 16:59:58 +00:00
Felix Kuehling
e9fbc23024 Fixed initialization of some stencil-related S4 registers, which was
misplaced in savageDDInitState_s3d, where was overwriting completely
unrelated S3D registers with garbage.
2004-12-15 16:54:19 +00:00
Felix Kuehling
91fd299b6b Moved some code from savageCreateContext to savageInitDriver, where it
belongs. Removed some obviously useless code. Fixed computation of
MaxTextureLevels.
2004-12-15 16:50:57 +00:00
Felix Kuehling
9fb668c576 Fixed some missing uint8_t -> u_int8_t. 2004-12-15 15:44:28 +00:00
Keith Whitwell
cc488b03a3 Add _mesa_delete_texture_object() call to viaDeleteTexture
[Freedesktop BUG 2080]
2004-12-15 13:59:47 +00:00
Keith Whitwell
ae68c3212b Add some catchall commands to realclean target to remove built files
which are forgotten about when the configs/current symlink changes.
2004-12-15 11:03:41 +00:00
Daniel Borca
3f1205819a updated makefiles for gcc 3.4.3 and bnu 2.15 2004-12-15 08:00:43 +00:00
Daniel Borca
65dfab66e5 minor info update 2004-12-15 07:56:49 +00:00
Daniel Borca
8b563fd4c5 added DMesaProc type to prevent gcc 3.4.3 warnings 2004-12-15 07:55:38 +00:00
Daniel Borca
654dccfd85 added DMesaProc type to prevent gcc 3.4.3 warnings.
sw tc is disabled by default
2004-12-15 07:54:20 +00:00
Daniel Borca
ea38858127 protected elfish code against non-elf compilers 2004-12-15 07:52:35 +00:00
Brian Paul
3df033a93b fixes for fragment programs 2004-12-15 01:13:39 +00:00
Brian Paul
69a5896238 init span.w, dwdx, dwdy in case we're running a fragment program 2004-12-15 01:11:36 +00:00
Brian Paul
55481b3a29 tweaks to the LIT instructions 2004-12-15 01:07:52 +00:00
Brian Paul
244adeb639 s/DP3/DP3_SAT/ to prevent negative values 2004-12-15 00:54:17 +00:00
Alan Hourihane
968cbf94d9 uint*t -> u_int*t 2004-12-14 22:37:46 +00:00
Alan Hourihane
fc84bec654 fix warning 2004-12-14 10:59:37 +00:00
Alan Hourihane
38b317d508 uint*t -> u_int*t changes 2004-12-14 09:11:52 +00:00
Ian Romanick
9fb024ba97 Added many (hopefully all) missing 'output="true"' attributes. Added
missing enum information for GL_EXT_cull_vertex and
GL_SGIS_texture_color_mask.  Added GL_SUN_mesh_array.  Corrected the
spelling of the "length" parameter to GetActiveUniformARB.
2004-12-13 23:58:09 +00:00
Ian Romanick
dea44ca491 Trivial shell script to search the API definition file and print out the
next numerically available API entry-point offset.
2004-12-13 21:26:50 +00:00
Daniel Borca
8c0b1d8826 disabled ClipMask usage in vb emitter (clipping bugs?) 2004-12-13 08:44:46 +00:00
Brian Paul
8402149766 removed unused visInfo var 2004-12-12 22:24:09 +00:00
Brian Paul
af808afbe7 fix recursion problem introduced on Nov 27 2004-12-12 22:22:10 +00:00
Brian Paul
68d293b035 Added driver hooks for GetTexImage() and GetCompressedTexImage().
Added fallback _mesa_get_[compressed]_teximage() routines to texstore.c
2004-12-12 19:03:16 +00:00
Keith Whitwell
5aa1a111a4 Fix a couple of glitches 2004-12-10 17:18:00 +00:00
Daniel Borca
3cc28c96cd allow GetTexImage with RGBA format and COLOR_INDEX internalformat 2004-12-10 07:36:35 +00:00
Brian Paul
7af80ca8c1 typo 2004-12-09 23:23:14 +00:00
Brian Paul
a8158599df bring in 6.2.1 changes 2004-12-09 23:21:36 +00:00
Brian Paul
8597dd3e96 check if using a PBuffer in clip_for_xgetimage() 2004-12-09 16:23:03 +00:00
Keith Whitwell
da3e15c2fd Get linux-solo dependencies building correctly,
Make sure symlinks are built in driver directories before running makedepend.
2004-12-09 08:42:19 +00:00
Daniel Borca
2fc3a958a4 make sure we're cleaning up everything 2004-12-09 07:44:37 +00:00
Daniel Borca
a280d3347a simplistic ICD implementation for fx/Mesa 2004-12-09 07:43:59 +00:00
Dave Airlie
0e01b23798 back out Keiths last checkin - for Solo the include order is important 2004-12-09 00:25:06 +00:00
Dave Airlie
b2ad61fd40 fixup pci code for Jon's last checkin for changing page size 2004-12-09 00:18:59 +00:00
Roland Scheidegger
b31b7836d6 (Stephane Marchesin, me) add hyperz support to radeon and r200 drivers. Only fast z clear and z buffer compression are supported for now, hierarchical-z is not. Still problems with multiple apps and z/stencil readback, which is why hyperz is disabled per default. Also add the new point sprite packet drm 1.13 accepts to the sanity code. 2004-12-08 17:32:46 +00:00
Keith Whitwell
fc23672327 Improve the behaviour of the build system wrt depend files.
- Remove the -Y option for makedepend, so that the standard
	  directories are searched
	- No longer pipe the multiple errors that the -Y option caused
	  into /dev/null -- we want to know about these failures.
	- Fix up a few other misc makedepend failures.
2004-12-08 15:16:36 +00:00
Keith Whitwell
e5aa3dd29b Demonstrate using a color matrix for yuv-to-rgb conversion at texture
upload time.
2004-12-08 14:56:40 +00:00
Alan Hourihane
c69d60fbe4 Use union type to avoid strict aliasing problems. 2004-12-08 14:26:48 +00:00
Alan Hourihane
c63f3cf85d silence warnings 2004-12-08 14:00:46 +00:00
Alan Hourihane
8635615501 Check for some header defines before redefining functions. Silences warnings. 2004-12-08 12:59:15 +00:00
Alan Hourihane
03dc05a605 silence warning 2004-12-08 12:35:55 +00:00
Dave Airlie
23b033ad28 From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Attached is a patch that adds pci init code for mesa solo on radeon. It's been
tested on an itanium 2 with a radeon 7000 and it works here.
The patch adds a new field in the miniglx.conf config file, to choose between
pci and agp.
2004-12-08 06:15:01 +00:00
Roland Scheidegger
e1b4fec71c fix depth/stencil readback if coordinates are larger than 1023 (https://bugs.freedesktop.org/show_bug.cgi?id=2010). Should now work up to 2047, which is the current limit for 3d rendering. 2004-12-08 03:07:34 +00:00
Daniel Borca
3b65cab455 fixed an include path 2004-12-07 15:57:33 +00:00
Daniel Borca
c049d4bc89 explicit cast in a few places 2004-12-06 08:11:14 +00:00
Daniel Borca
d033ce63da disable junk for mingw 2004-12-06 08:10:33 +00:00
Daniel Borca
ac7091078f small fix for debug paths 2004-12-06 08:10:01 +00:00
Daniel Borca
fa9ab2d052 sync with glut/glx 2004-12-06 08:09:22 +00:00
Brian Paul
ddfd2067ae report bugs at freedesktop.org 2004-12-05 18:03:21 +00:00
Brian Paul
86cbfc2fac direct bug reports to freedesktop.org 2004-12-05 18:02:01 +00:00
Ian Romanick
74764061fa Move common GLX code to glX_XML.py. This will make adding glX_proto_recv.py
easier later on.
2004-12-03 20:31:59 +00:00
Ian Romanick
47719fda0c Fix a minor bug in glXEnumFunction::PrintUsingTable. Add some comments.
Add the (currently unused) utility funciton glXFunction::opcode_real_value.
2004-12-03 20:24:50 +00:00
Brian Paul
cbc527cd17 mask color indexes against palette size, per the spec 2004-12-03 18:12:08 +00:00
Roland Scheidegger
0fdb7ef877 only enable GL_MESA_ycbcr_texture for real r200 chips, not the derivatives, since yuv textures do not work for some reason on the other chips. 2004-12-03 18:09:40 +00:00
Roland Scheidegger
de7b071b55 enable GL_EXT_stencil_wrap (patch from idr), including some hacks for original radeons which have some broken stencil ops. 2004-12-03 17:26:41 +00:00
Brian Paul
25b67e6404 Use the GL datatypes. Lots of assorted clean-ups. 2004-12-03 15:58:07 +00:00
Brian Paul
404055216d silence warning 2004-12-03 15:39:58 +00:00
Brian Paul
2d846b712c re-disable TRACE 2004-12-03 15:39:08 +00:00
Brian Paul
a760ccf6d8 silence a variety of warnings found with g++ 3.4.2 2004-12-03 15:24:34 +00:00
Alan Hourihane
025aa9efcd silence warnings 2004-12-02 14:50:13 +00:00
Alan Hourihane
8694285053 reverse some debug that slipped through 2004-12-02 13:32:55 +00:00
Alan Hourihane
22ae633d1e Fix some warnings 2004-12-02 13:29:40 +00:00
Ian Romanick
ba807fbe29 Updated the schema. Added comments explaining some of the non-obvious
attributes.  Modified a couple handcode functions to use the count_scale
attribute instead.
2004-12-02 00:01:12 +00:00
Ian Romanick
00d153eb72 Corrected a problem with the sizes of the MAP[12]_* enums. 2004-12-01 23:53:43 +00:00
Ian Romanick
5ee2f9aed4 Added a couple missing always_array annotations and a couple trival
enum-only extensions.
2004-12-01 21:25:52 +00:00
Ian Romanick
596ccff699 Prevent possible divide-by-zero error. 2004-12-01 20:20:13 +00:00
Ian Romanick
77e297c368 Refactor ExtractDir and OpenDriver to be a bit more clear. 2004-12-01 09:41:14 +00:00
Ian Romanick
9bba1cfc39 Use indirect_size.c and indirect_size.h generated by using
src/mesa/glapi/glX_proto_send.py with the '-m size_c' and '-m size_h'
options.
2004-12-01 09:11:04 +00:00
Ian Romanick
b53df18624 Slightly tweak the format of the size prototypes. 2004-12-01 09:06:34 +00:00
Ian Romanick
548435215d Use the indirect_init.c generate by using src/mesa/glapi/glX_proto_send.py
with the '-m init_c' option.
2004-12-01 08:49:41 +00:00
Ian Romanick
4f4854a4af Make the transition to script-genereated GLX code easier.
Convert GL 1.4 function names to EXT_blend_func_separate names.
2004-12-01 08:47:35 +00:00
Ian Romanick
529381ff75 Make the transition to script-genereated GLX code easier.
Convert GL 1.4 / ARB_point_parameter function names to EXT_point_parameter /
NV_point_sprite names.
2004-12-01 08:42:31 +00:00
Ian Romanick
e9789cf071 Python script to generate various bits of client-side GLX protocol code. 2004-12-01 08:35:37 +00:00
Ian Romanick
6b89a8363b Make the transition to script-genereated GLX code easier.
Move "handcoded" ARB_window_pos / MESA_window_pos functions to their own
file.  Modify the ARB_window_pos functions to use the MESA_window_pos names.
2004-12-01 08:31:15 +00:00
Ian Romanick
bb427b10b1 Make the transition to script-genereated GLX code easier.
Move "handcoded" ARB_transpose_matrix functions to their own file.  From
here on out, such handcoded functions should go in a file named
indirect_FOO.c, where "FOO" is some logical name for the functionality
(e.g., part of the extension name, etc.).
2004-12-01 08:22:44 +00:00
Ian Romanick
c8c24d049d Make the transition to script-genereated GLX code easier.
Move EXT_vertex_array wrapper functions from indirect_init.c to vertarr.c.
Fix problems with EXT_multi_draw_arrays function names.
2004-12-01 08:15:01 +00:00
Ian Romanick
345ed3ac8c Make the transition to script-genereated GLX code easier.
Eliminate the need for indirect_wrap.h and NEED_GL_FUNCS_WRAPPED.
Basically, this means prepending __indirect_ to all the definitions and
calls of GL functions that don't already have it.
2004-12-01 08:02:50 +00:00
Ian Romanick
249a5552f1 Make the transition to script-genereated GLX code easier.
Convert GL_ARB_texture_compression related functions to use the extension
version of the names instead of the GL 1.3 versions.
2004-12-01 07:34:25 +00:00
Ian Romanick
4f0a75e724 Added the ability to get the size of a parameter as a string. Changed the
meaning of "variable length array" to include variables that are "counted"
instead of just ones that use an enum to map to a count.  Added glParameter
to the glItemFactory.
2004-12-01 00:29:48 +00:00
Ian Romanick
9001d67309 Added enums for GL_OES_read_format. 2004-12-01 00:25:46 +00:00
Ian Romanick
fc43857cc9 Add trivial support ARB_texture_rectangle and OES_read_format. 2004-12-01 00:20:22 +00:00
Ian Romanick
05f4a2b92d Missed GL_OES_read_format_bit in last commit. 2004-12-01 00:18:01 +00:00
Ian Romanick
f1f18cd1b8 Since we know the problem with HP_occlusion_test is / was on the server-side,
re-enable the extension on the client-side.
2004-11-30 23:29:51 +00:00
Ian Romanick
6106502fdf PrioritizeTextures, GetClipPlane, and WindowPos3fMESA don't need to be
handcoded, but Enable and Disable do.  Corrected some minor problems in the
PixelMap functions and some ARB_vertex_program functions.  Added size data
for the enums that can be passed to the Map[12][fd] functions.  Added the
enums for EXT_pixel_buffer_objects.
2004-11-30 23:27:33 +00:00
Keith Whitwell
4f144b6087 EXT_422_pixels test 2004-11-30 19:15:06 +00:00
Brian Paul
bf4c23d00f no need to include stddef.h anymore 2004-11-29 17:31:03 +00:00
Brian Paul
dc991a2085 silence a warning 2004-11-29 17:30:21 +00:00
Brian Paul
55656a53d4 added __glXFindDRIScreen to glXGetProcAddress (bug 1068879) 2004-11-29 17:26:19 +00:00
Brian Paul
0d5e6ccfd6 fixed OSF/1 shared lib problem (bug 1065260) 2004-11-29 17:23:12 +00:00
Brian Paul
e25c7c2ad5 update from Jouk 2004-11-29 14:41:46 +00:00
Brian Paul
9cf65c5a5b fix missing width/height error 2004-11-28 18:07:33 +00:00
Brian Paul
65a66f5bc3 Remove _mesa_ResizeBuffersMESA() call from _mesa_set_viewport().
Now, the driver's Viewport routine should call _mesa_ResizeBuffersMESA()
if necessary.
Cleaned up code related to GLframebuffer width/height initialization.
Set initial viewport/scissor params in _mesa_make_current2(), instead of
in the drivers' MakeCurrent functions.
2004-11-27 22:47:59 +00:00
Brian Paul
118a8bad73 new comments and assertions 2004-11-27 22:44:35 +00:00
Brian Paul
29926a11b1 Remove the redundant width, height fields in xmesa_buffer struct. Just use
the values in the contained GLframebuffer.
Removed some other unneeded code.
2004-11-27 21:20:37 +00:00
Brian Paul
b371e50d6d remove _glapi_add_entrypoint() calls, they're already in context.c 2004-11-27 20:21:25 +00:00
Brian Paul
de43484c73 add a few functions in add_newer_entrypoints() 2004-11-27 20:14:03 +00:00
Brian Paul
b5b8d22c4e Change the dispatch offsets for the VertexAttrib*NV functions so they don't
alias with the corresponding ARB functions.
GL_ARB_vertex_shader (and OpenGL 2.0's) VertexAttrib functions don't alias
with conventional vertex attributes, as GL_NV_vertex_program does.
So, the ARB and NV version of VertexAttrib need to be distinct.
2004-11-27 20:07:08 +00:00
Brian Paul
0699b0bb17 silence warnings 2004-11-27 19:57:46 +00:00
Brian Paul
6bca16b877 misc updates 2004-11-27 19:42:16 +00:00
Brian Paul
91d09a9ffa Set symbol visibility to 'default', if supported by gcc. 2004-11-27 17:32:03 +00:00
Brian Paul
819b519534 use new PUBLIC macro for symbol export 2004-11-27 17:30:41 +00:00
Brian Paul
3903c1f2bc don't need glut_fbc.c 2004-11-27 16:57:06 +00:00
Brian Paul
1d97c277e0 new GetOverlayInfo() function to reduce code and silence warnings 2004-11-27 16:49:52 +00:00
Brian Paul
4d880987d2 Have OSMesaGetProcAddress() return new OSMESAproc typedef. 2004-11-27 16:24:39 +00:00
Brian Paul
21f6978c53 clean up code related to dispatch table initialization 2004-11-27 05:05:32 +00:00
Brian Paul
13435525c4 clean up 'depend' commands 2004-11-27 04:58:39 +00:00
Brian Paul
2dd5b9edaa typedef GLUTproc, return it from glutGetProcAddress() 2004-11-27 04:54:48 +00:00
Brian Paul
59fcd54f29 remove -Wmissing-prototypes from g++ flags, per gcc 3.4 2004-11-27 04:50:34 +00:00
Brian Paul
11a0a99d1b use @ to silence some unneeded output 2004-11-27 04:37:25 +00:00
Brian Paul
209bd3a5b4 make get_static_proc_address() return a _glapi_proc 2004-11-27 04:02:32 +00:00
Brian Paul
7ee79c80ea use _glapi_proc 2004-11-27 03:51:25 +00:00
Brian Paul
767e15a78a Use new _glapi_proc typedef instead of void * for function pointers.
Misc clean-ups in glapi.c
2004-11-27 03:51:11 +00:00
Brian Paul
1136412013 fix typo, update version/date 2004-11-27 03:47:14 +00:00
Brian Paul
911a8bc62c remove the GLAPI/GLAPIENTRY defines - they're already in gl.h 2004-11-27 03:29:39 +00:00
Brian Paul
39c86eac9b removed a bunch of #define cruft, in case anyone still uses this code 2004-11-27 03:21:43 +00:00
Brian Paul
568f7578d3 Removed GLCALLBACK stuff - apparently never used anywhere.
Removed GLWINAPI stuff - only used (unnecessarily?) in enums.c
2004-11-27 03:14:57 +00:00
Brian Paul
d2c1027d40 added X11 and OSMESA source to ALL_SOURCES, updated etags command 2004-11-26 16:23:22 +00:00
Brian Paul
4fe34f340c (GLint*) casts in glGetIntegerv calls 2004-11-26 13:43:17 +00:00
Brian Paul
59651a076d update some type names 2004-11-26 13:34:45 +00:00
Brian Paul
c5f9aa7750 Use a generic function typedef instead of void * to avoid gcc 3.4 warnings. 2004-11-25 23:26:16 +00:00
Brian Paul
be2de8b299 Use __GLXextFuncPtr type instead of void * for generic functions to
avoid gcc 3.4 compiler warnings.
Remove the unused/obsolete GLX_render_texture stuff.
2004-11-25 23:25:33 +00:00
Brian Paul
4dafbc3dc7 Some new comments, clean-up formatting, etc. 2004-11-25 23:23:40 +00:00
Brian Paul
936028f8b0 Started some assorted clean-ups in #defines, typedefs, etc.
Next: move all the Windows/WGL stuff into the drivers/windows/ directory.
2004-11-25 23:22:56 +00:00
Brian Paul
b653aaede5 minor APIENTRY clean-ups 2004-11-25 23:20:07 +00:00
Keith Whitwell
7a293a9962 Update expected DRM version to 2.0.0 2004-11-25 14:05:05 +00:00
Ian Romanick
6dbb8ead0f Added support for several additional enum-only extensions:
ARB_texture_rectangle, EXT_texture_env_dot3, EXT_texture_mirror_clamp,
ATI_texture_mirror_once, IBM_texture_mirrored_repeat,
NV_packed_depth_stencil, and NV_texture_rectangle.
2004-11-24 18:55:45 +00:00
Ian Romanick
e0a1cd3112 Added information about numerous enums to aid the development of automatic
code generation for GLX protocol.  This includes adding support for several
additional enum-only extensions: EXT_filter_anisotropic, NV_expand_normal
NV_fog_distance, NV_texture_env_combine4, SGIS_generate_mipmap,
SGIX_clipmap, SGIX_depth_texture, SGIX_fog_offset, SGIX_shadow,
SGIX_shadow_ambient, SGIX_texture_coordinate_clamp, SGIX_texture_lod_bias,
and SGIX_texture_scale_bias.
2004-11-24 18:13:43 +00:00
Brian Paul
6b6c96bdeb update _mesa_store_teximageXd() comments and minor code clean-up 2004-11-23 23:29:42 +00:00
Roland Scheidegger
ba62741261 revert enabling of hw quads for swtcl. It lead to problems with quad_strips, since they'll get reduced to quads sometimes if hw quads are enabled. But this needs more thought, since it looks like clipped primitives will always be emitted as polys, so the reduced primitives for triangles, quads, quads_strips, polys all need to be the same, otherwise get lockups with for instance the olympic test. Render templates would probably need to be changed for this to work. 2004-11-23 18:49:18 +00:00
Ian Romanick
180b0db344 Set the "ignore" flag for any functions that the open-source libGL doesn't
already support GLX protocol for.
2004-11-23 00:19:51 +00:00
Brian Paul
a789252feb Don't allow queries/etc of buffer object 0 - it's invisible to users.
Misc clean-ups.
2004-11-22 20:01:25 +00:00
Brian Paul
ebe8d3152d added GL_RED/GREEN/BLUE to is_color_format() 2004-11-22 19:58:59 +00:00
Brian Paul
d0a82a652d silence warning, minor clean-up 2004-11-22 19:39:16 +00:00
Brian Paul
c247c7f66f applied SPARC patch (freedesktop bug 1898) 2004-11-22 19:27:40 +00:00
Brian Paul
263317d00a include <X11/Xthreads.h> instead of "Xthreads.h" 2004-11-22 19:11:01 +00:00
Brian Paul
65b79057b9 misc updates 2004-11-22 17:49:15 +00:00
Daniel Borca
f76be3d6f2 handle ENABLE_BIT for EXT_stencil_two_side 2004-11-22 08:46:53 +00:00
Brian Paul
4b4e7a982a fix APP_LIB_DEPS (bug 1065260) 2004-11-15 16:54:14 +00:00
Adam Jackson
ad919c30df Sync with Xorg head: mingw build fixes from Alexander Gottwald. 2004-11-15 15:31:32 +00:00
Daniel Borca
c0be56e5e8 moved windoze specific code outside drivers/glide/ 2004-11-15 10:54:57 +00:00
Daniel Borca
4ffc5fa7a5 work around a bug in gcc 3.3.3 (which duplicates ASM block) 2004-11-15 08:06:55 +00:00
Daniel Borca
fdd74136b3 fix _mesa_image_address2d invocation 2004-11-15 08:05:59 +00:00
Daniel Borca
37918cf3d9 use float constants 2004-11-15 08:04:33 +00:00
Daniel Borca
fd9b30750a use parentheses to avoid warning 2004-11-15 08:03:22 +00:00
Daniel Borca
16e6f05772 the win32 interface will be moving under windows/ 2004-11-15 08:02:24 +00:00
Daniel Borca
05cb9468f3 emphasize on the contents of Glide SDK 2004-11-15 08:01:20 +00:00
Roland Scheidegger
e6cd5d675f enable hw quad primitive for swtcl 2004-11-12 18:34:35 +00:00
Roland Scheidegger
ce055c26f0 add LOCK_HARDWARE/UNLOCK_HARDWARE to radeonClear so state gets updated which hopefully fixes lockups (?) (from r200 driver) 2004-11-12 18:29:51 +00:00
Roland Scheidegger
8e39265752 (from r200 driver) If an application cleared before any state had been emitted, that clear would
happen before any state had been set, causing a hang later on.  Fix this by
calling radeonFlush instead of FIREVERTICES (which checks if any state has been
emitted but not flushed, before calling Flush) in radeonClear.  While here, add
some more debugging info which was useful, and remove an unnecessary
save/restore in BackUpAndEmit.
2004-11-12 18:27:14 +00:00
Roland Scheidegger
6cf002c0c2 fix quads to use GL_QUADS instead of GL_TRIANGLES as primitive 2004-11-12 18:00:44 +00:00
Daniel Borca
8d88f826b9 small note regarding SSE under pure DOS 2004-11-12 15:00:30 +00:00
Daniel Borca
0676fc357a added a few sanity checks
made coding style a bit more consistent
2004-11-12 14:58:26 +00:00
Daniel Borca
885f10706a added DD_TRI_TWOSTENCIL to ease EXT_stencil_two_side in device drivers 2004-11-12 10:23:10 +00:00
Daniel Borca
f37383c1c6 wip hack for EXT_stencil_two_side 2004-11-12 10:11:04 +00:00
Daniel Borca
79a98dea91 pop(stencil) for EXT_stencil_two_side 2004-11-12 09:56:33 +00:00
Adam Jackson
a2c2393d91 brown paper bag, r100 can't do hardware quads. 2004-11-12 04:20:15 +00:00
Adam Jackson
4d17d00bfc make render_quads_verts call EMIT_PRIM with the arguments in the right order,
and enable hardware quads on r200 and radeon.  samples/prim renders quads
correctly now.
2004-11-12 04:13:27 +00:00
Brian Paul
b271ce8eda allow specifying image file on command line 2004-11-10 23:16:22 +00:00
Brian Paul
60909388ab GL_(UN)PACK_SKIP_IMAGES should only be applied to 3D texture pack/unpacking
and ignored for 1D and 2D images.
Need to pass in image dimensions (1,2,3) to the _mesa_image_address() function.
This change gets propogated to some other routines.
Also added new _mesa_image_address[123]d() convenience functions.
2004-11-10 15:46:52 +00:00
Brian Paul
f00d7edd74 added shaderobjects.c 2004-11-10 15:25:37 +00:00
Roland Scheidegger
de08b0d7ed add some chip ids 2004-11-10 01:49:01 +00:00
Brian Paul
b12594d2a0 do clipping prior to XGetImage, just in case the image would extend beyond the screen's bounds 2004-11-09 01:20:57 +00:00
Brian Paul
2a10ad16a6 use the new _mesa_clip_readpixels() routine 2004-11-09 01:10:36 +00:00
Brian Paul
e677da9e54 added a comment and assertion in _mesa_clip_drawpixels() for PixelZoom 2004-11-09 01:08:04 +00:00
Brian Paul
c55c963f4c Removed _swrast_clip_pixelrect(). Use _mesa_clip_drawpixels() instead. 2004-11-09 01:04:50 +00:00
Brian Paul
4084e3c215 added _mesa_clip_drawpixels() and _mesa_clip_readpixels() 2004-11-09 01:03:49 +00:00
Brian Paul
4f28c9c35a don't use ctx->Pack, use the function argument 2004-11-09 00:55:13 +00:00
Brian Paul
83889ffd97 Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW).  (Gregor Anich)
2004-11-08 15:08:48 +00:00
Brian Paul
5849e3d353 shorter error messages when calling a GL function without a bound context (FDO bug 1775) 2004-11-05 18:32:02 +00:00
Ian Romanick
cb7f212f93 Add EXT_stencil_wrap test that doesn't depend on stencil read-back
functioning.
2004-11-04 22:32:41 +00:00
Adam Jackson
473fe6d6bf constify a few arrays. 2004-11-03 18:55:31 +00:00
Adam Jackson
5dd18e95d9 static char * -> static char [] 2004-11-03 18:55:20 +00:00
Roland Scheidegger
d294f79190 enable GL_EXT_fog_coord. Calculate fog factors and submit them instead of fog coords (it seems the chip cannot do fog factor computation when not using fragment depth as fog coord source). vtxfmt uses fallback for now (most code present but some magic would be needed if replaying vertices is necessary later on). 2004-11-03 17:29:39 +00:00
Ian Romanick
bdd53efe83 Added MMX optimized version of the RGB565 ReadRGBASpan routine. 2004-11-02 18:25:45 +00:00
Nicolai Haehnle
2302cc1a25 No visible changes, but commit the groundwork for further experiments:
- Install custom (though inactive) pipeline
- Track depth test and culling state in hardware registers
2004-11-02 13:06:45 +00:00
Nicolai Haehnle
b187341e63 Add culling registers, sync versions of r300_reg.h 2004-11-02 13:05:40 +00:00
Brian Paul
b17a1a1826 merge the AIX and AIX64 cases 2004-11-01 22:28:42 +00:00
Keith Whitwell
cc78e40172 Nicolai's sw-clipspan-fixes.patch 2004-11-01 20:27:43 +00:00
Daniel Borca
3d2b4bfa95 cleaned up the mess a bit 2004-11-01 09:06:17 +00:00
Daniel Borca
95e2a8099b small aesthetic correction 2004-11-01 08:49:55 +00:00
Daniel Borca
e14119f143 updated "clean" target in makefiles 2004-11-01 08:40:03 +00:00
Daniel Borca
63a2f2a977 protected against old djgpp distros 2004-11-01 08:38:12 +00:00
Daniel Borca
3c17d73c87 fixed compilation error 2004-11-01 07:40:53 +00:00
Brian Paul
051cf9df6a fix convolution regression from revision 1.48 to 1.49 2004-11-01 01:00:16 +00:00
Brian Paul
a6c21a2af1 don't advertise GL_ARB_vertex/fragment_shader until they're done 2004-10-31 18:55:00 +00:00
Brian Paul
a196565e04 added a cast to ADD_POINTERS macro 2004-10-31 18:54:10 +00:00
Brian Paul
aea02adc7b remove PBO work from to-do list 2004-10-31 18:44:24 +00:00
Brian Paul
753476c162 finished up PBO support 2004-10-31 18:43:46 +00:00
Brian Paul
effb720882 indentation fix 2004-10-31 18:41:38 +00:00
Brian Paul
450e917c9d Use the _mesa_scale_and_bias_rgba() function in the convolution functions.
Minor clean-ups.
2004-10-31 18:40:55 +00:00
Brian Paul
331cc1dcba PBO support for gl[Get]PixelMap functions 2004-10-31 18:31:07 +00:00
Brian Paul
66f3231322 PBO support for glColorTable, glColorSubTable, glGetColorTable, etc. 2004-10-31 17:56:28 +00:00
Brian Paul
bd3b40ad75 PBO support for glConvolutionFilter1D/2D, glGetConvolutionFilter, etc. 2004-10-31 17:36:23 +00:00
Brian Paul
d56928f10d updated for PBOs 2004-10-31 17:04:07 +00:00
Brian Paul
b6f97582dd glPolygonStipple() and glGetPolygonStipple() updated for PBOs. 2004-10-31 16:52:48 +00:00
Brian Paul
1c86813922 PBO support for glGetCompressedTexImage(). 2004-10-31 16:35:06 +00:00
Brian Paul
b46712ca9d glGetTexImage() now works with PBOs. 2004-10-31 16:24:32 +00:00
Brian Paul
c0ebc4931a Map/Unmap PBO as needed so that the texstore routines can work with
hardware-based PBOs in the future.
2004-10-31 16:18:07 +00:00
Brian Paul
ba164c4614 Removed _swrast_validate_pbo_access().
In x11 driver, map/unmap PBO as needed in DrawPixels functions.
2004-10-31 15:49:59 +00:00
Brian Paul
355467bed8 Allow the software fallback glDrawPixels, glReadPixels, glBitmap commands to
work with real, hardware-based PBOs in the future by mapping/unmapping the
PBO buffer as needed.
2004-10-31 15:39:04 +00:00
Brian Paul
c6136ea62c unbind GL_PIXEL_UNPACK_BUFFER_EXT before calling glBitmap! 2004-10-31 15:27:12 +00:00
Brian Paul
7eab337d9c use _mesa_unmap_buffer by default 2004-10-31 15:23:42 +00:00
Brian Paul
2daa4137b6 Remove redundant error checking.
Added _mesa_buffer_unmap().
Minor clean-ups.
2004-10-31 00:17:42 +00:00
Brian Paul
9ae96a5ce8 remove debug code 2004-10-29 19:31:52 +00:00
Brian Paul
7520e25995 Updated getprocaddress test to use gl_API.xml instead of old APIspec file. 2004-10-29 19:12:08 +00:00
Michal Krol
efb8b3e251 slang syntax conforming spec rev. 1.10.59 2004-10-29 17:09:40 +00:00
Daniel Borca
b0996b19f0 make sure we don't generate random alpha 2004-10-29 13:35:56 +00:00
Daniel Borca
03501e7a29 decoder "width" parameter represents "stride-in-pixels" 2004-10-29 13:25:44 +00:00
Brian Paul
7faf519233 VertexAttrib3svNV was incorrect 2004-10-29 04:00:50 +00:00
Adam Jackson
0b8acd90b3 libGL needs libXxf86vm.a. 2004-10-29 00:10:43 +00:00
Brian Paul
4e120c9718 obsolete 2004-10-28 22:18:52 +00:00
Brian Paul
98fa2bf364 minor clean-ups, found with pychecker 2004-10-28 21:11:02 +00:00
Brian Paul
fa557e904d name parameter to glGetActiveAttribARB() should not be const.
Added shaderobjects.c to sources file.
2004-10-28 21:03:19 +00:00
Michal Krol
af7a807650 renumber ARB_shader_objects and ARB_vertex_shader offsets
to get BlendEquation have offset 710
fix param name lack with GetInfoLogARB
2004-10-28 11:14:02 +00:00
Eric Anholt
cc182213c8 Add FreeBSD DRI build targets. Doesn't build at the moment, due to the same
problems as Linux.
2004-10-28 00:19:21 +00:00
Eric Anholt
948f2720f7 Use the generic __amd64__, instead of __AMD64__ which has to be defined by hand. 2004-10-28 00:18:02 +00:00
Brian Paul
51c026b265 updated PLIB URL 2004-10-27 23:01:47 +00:00
Adam Jackson
3291de6d06 Bug #1713: Some rare libGL's have __glXFindDRIScreen defined but do not
export it via glXGetProcAddress.  These are not supported anymore, so print
an error message to that effect.
2004-10-27 17:50:09 +00:00
Michal Krol
b28031d57e remove unused entries 2004-10-27 17:36:23 +00:00
Michal Krol
80d468c1c9 fill api entries for ARB_shader_objects and ARB_vertex_shader 2004-10-27 17:34:27 +00:00
Michal Krol
678ea6cd5c add entries for extensions ARB_shader_objects, ARB_fragment_shader and
ARB_vertex_shader
2004-10-27 17:27:57 +00:00
Michal Krol
2f11cbd15b add FEATURE flags for ARB_shader_objects, ARB_vertex_shader and
ARB_fragment_shader
2004-10-27 17:16:06 +00:00
Michal Krol
c1fe469870 by karoshi - ARB_shader_objects implementation
empty routines by now
2004-10-27 17:09:10 +00:00
Michal Krol
ed2c18c08c by karoshi - header file for ARB_shader_objects implementation 2004-10-27 16:57:04 +00:00
Michal Krol
26bf36ce49 add support for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:46:26 +00:00
Michal Krol
beb9554273 add support for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:39:09 +00:00
Michal Krol
a97bc422d6 assign api offsets for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:37:24 +00:00
Michal Krol
71eb0a7fd6 regenerate with correct script 2004-10-27 15:40:46 +00:00
Michal Krol
b7293dc2b7 regenerate with correct script 2004-10-27 15:34:31 +00:00
Michal Krol
ec3ad66696 fix DrawBufferARB entry 2004-10-27 15:29:05 +00:00
Michal Krol
1c0f9d71bd fix DrawBuffersARB entry 2004-10-27 15:27:08 +00:00
Michal Krol
455c8177ad the file was empty! 2004-10-27 15:20:08 +00:00
Michal Krol
b15fd4ba76 by karoshi - add support for ARB_shader objects and ARB_vertex_shader 2004-10-27 15:06:18 +00:00
Ian Romanick
95ba352497 As per suggestions my Michel Daenzer, improve the fix for bugzilla #1513. 2004-10-26 19:20:40 +00:00
Brian Paul
640492aec9 added an attention-getting comment for developers who get stopped in _mesa_test_os_sse_support() while debugging 2004-10-26 17:29:59 +00:00
Brian Paul
2083131643 added stereo option (Jacek Rosik) 2004-10-26 14:36:32 +00:00
Adam Jackson
1cda832fd9 remove a -Werror from testing. 2004-10-25 22:19:43 +00:00
Adam Jackson
61702d4afe Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini. 2004-10-25 21:23:08 +00:00
Adam Jackson
312c68fab3 Add DRI_LIB_DEPS for the DRI drivers to link against. Remove expat from the
link list for libGL itself under DRI configurations, since the XML parsing
code is in the drivers themselves.
2004-10-25 21:20:29 +00:00
Adam Jackson
7badefa6c4 Bug #1679: Link DRI drivers against DRI_LIB_DEPS, not GL_LIB_DEPS. 2004-10-25 21:18:52 +00:00
Adam Jackson
cb3610e37c Import the GLX client side library, formerly from xc/lib/GL/glx. Build it
by adding 'glx/x11' to SRC_DIRS in your build config.
2004-10-25 21:09:16 +00:00
Adam Jackson
bcd8735546 Import sarea.h from Xorg, needed for client GLX code. 2004-10-25 20:52:11 +00:00
Nicolai Haehnle
5a9fd2afc6 Implement ColorMask 2004-10-24 06:17:20 +00:00
Nicolai Haehnle
d586540eaf Hardware accelerated depth clear 2004-10-24 05:52:10 +00:00
Adam Jackson
94987beb2c Bug #1682: Mesa core code that gets linked into DRI drivers should never call
through the GL API directly, but should instead use the GL_CALL macro.
2004-10-24 02:05:40 +00:00
Brian Paul
07553c58fd wrap angle value (Philipp Klaus Krause) 2004-10-23 18:55:48 +00:00
Brian Paul
e57b6d5a4f addes osdemo32 target (J.P. Delport) 2004-10-23 16:58:32 +00:00
Brian Paul
0aa0343fb0 minor fixes from J.P. Delport 2004-10-23 16:57:44 +00:00
Ian Romanick
74b0080086 Big-endian fixes for R200 sw TCL path. 2004-10-23 00:42:17 +00:00
Michal Krol
cb499595aa - add decimal literal integer support
- fix bug with c-style comment closing - sequences
  like /***/ were not correctly parsed
2004-10-22 12:42:37 +00:00
Michal Krol
c69ceaf8eb forgot about revision increment 2004-10-21 14:11:06 +00:00
Michal Krol
b80bc055bc - use new program option values from arbprogram.syn
- remove redundant check of parsed program target
- remove redundant check of relative addressing range
- use faster grammar interface
2004-10-21 14:09:54 +00:00
Michal Krol
ed60e19d8a remove redundant check of parsed program target 2004-10-21 14:06:18 +00:00
Michal Krol
718ba9773b change program options numbering to accommodate future
options (up to 256)
2004-10-21 13:57:24 +00:00
Michal Krol
cbef98c2ea add new grammar_check_fast entry for faster parsing 2004-10-20 15:19:58 +00:00
Michal Krol
904ef741de - speed up syntax parsing - the parser is now 4 times faster
note: to use it you must use grammar_check_fast entry
- allow decimal format for literal integers in .syn files
- raise am error if syntax has duplicate or unreferenced
  symbols
- do some little clean-up with linked-list stuff
- make macro APPEND_CHARACTER a function
- fix minor typos and bugs
2004-10-20 14:54:17 +00:00
Daniel Borca
a7855e835d fixed compilation errors 2004-10-20 11:59:28 +00:00
Daniel Borca
05517d02be fix compilation error in `convertPalette' (still have to fix the issue, though) 2004-10-19 06:35:01 +00:00
Ian Romanick
f404ff7b76 Small optimization for big-endian (e.g., PowerPC) systems. 2004-10-18 23:24:51 +00:00
Michal Krol
f459b9f9c0 conform to shader spec 1.10.59 2004-10-18 12:18:33 +00:00
Michal Krol
cfb62331bc conform to language version 1.10 rev 59
resolve TODOs
2004-10-18 09:49:25 +00:00
Daniel Borca
a0720cf104 print an error message in convertPalette before dying.
this is NOT a fix, but it'll have to wait a little...
2004-10-18 08:17:17 +00:00
Daniel Borca
c99a99b3bc small fix to match new _mesa_rescale_teximage2d 2004-10-18 08:07:26 +00:00
Daniel Borca
1cfe1e8925 changed _mesa_rescale_teximage2d to allow rescaling of padded images 2004-10-18 08:04:21 +00:00
Daniel Borca
8cd728f436 added dstRowStride to dxtCompressTexFuncExt;
good for subimages, padded images and such.
NB: intentionally, this is the last parameter, to avoid
breaking the current API! adding a new parameter
is not harmful, at worst it will be ignored, since all
platforms use a CDECL calling convention.
2004-10-18 07:54:09 +00:00
Daniel Borca
13ec04c480 use RowStride instead of Width in texel fetchers.
changed some pointers to be (char *) instead of (long)
2004-10-18 07:49:26 +00:00
Ian Romanick
b430a1ae22 Fix compile errors when DEBUG is defined. 2004-10-18 00:00:41 +00:00
Ian Romanick
48da4a4a86 Fix t_vertex byte-ordering issues for PowerPC. This was tested with gears
and tunnel (for fog).
2004-10-17 21:54:41 +00:00
Ian Romanick
40e852271b Add ARGB modes to support big-endian systems. 2004-10-17 21:53:43 +00:00
Ian Romanick
add38812f0 Fix hangs on big-endian (e.g., PowerPC) hardware. 2004-10-17 21:29:58 +00:00
Nicolai Haehnle
ff42a00402 - FIX: flickering
- Scissor support works now
2004-10-17 20:26:06 +00:00
Brian Paul
158a251a6b added initial support for -exports option, Linux/OpenBSD only for now 2004-10-16 15:10:45 +00:00
Brian Paul
901d9b9a92 GL_OES_read_format info 2004-10-16 15:04:43 +00:00
Brian Paul
c498742768 if CXX or CC env vars aren't set, use g++, gcc by default (Linux) 2004-10-16 15:02:16 +00:00
Ville Syrjala
3152b1586c Removed two unnecessary variables. 2004-10-16 11:26:06 +00:00
Ville Syrjala
63e9a968ff Fixed off by one errors in clipping. 2004-10-16 11:09:26 +00:00
Eric Anholt
b1ebd306bf Add code to support projective texturing and fix mixed enabling of texture
coordinate generation.  Original code by Roland Schiedegger, with changes by
myself.  While here, ensure that the swtcl path does tnl_install_attrs enough
when fog/specular are being (en/dis)abled.

Notable effects:
- projtex test works with TCL and is closer with swtcl (Bugzilla #1461)
- 8/9 squares work in texgenmix instead of 3.
- texcyl "reflect" mode works (GL_SPHERE_MAP is now a fallback -- unclear if the
  hardware can actually support it).
- flickering in doom3 replaced by just plain darkness.
- blocktube fixed (Bugzilla #984)
- fixes stex3d
2004-10-16 03:36:14 +00:00
Eric Anholt
a1af92877d Always turn on the TAM_DEBUG3=0x6 workaround on real r200s. It appears that
the current cases for turning it on were insufficient (Bugzilla #1519, 729, 814)
and it has no significant performance impact.  Performance tested with quake3
in GL_LINEAR mode both with and without anisotropy, with the workaround always
on or always off.
2004-10-16 01:58:02 +00:00
Ian Romanick
33899b7c35 Add support for OES_read_format. As soon as glext.h is updated with the
enums for this extension, the changes to gl.h can be removed.
2004-10-16 01:16:54 +00:00
Brian Paul
83c74b7279 fix if/else bug in _mesa_ProgramEnvParameter4fARB (fdo bug 1645) 2004-10-16 00:29:03 +00:00
Ian Romanick
1aa37f97c4 Only build the MMX/SSE/SSE2 versions for ReadRGBASpan when the pixel format
matches what they optimized versions actually expect.
2004-10-16 00:03:27 +00:00
Ian Romanick
12b53f2079 Fixed a few places that should have been using GET_SRC_PTR. 2004-10-15 23:46:53 +00:00
Ian Romanick
ea6786b453 Convert MGA driver to use new spantmp2.h interface. 2004-10-15 23:00:52 +00:00
Nicolai Haehnle
5696710f96 Huge dumb drop. State:
- Color buffer clear is accelerated, but flickers (possibly caused by a
  recent DDX or Mesa change or bad merge)
- Everything else uses software fallback rendering
- There should be no clipping-related artifacts with the
  sw-clipspan-fixes.patch against Mesa (posted on dri-devel)
- Multiple clients should be rock solid with a DDX patch that is soon to
  come (soon = within the next hour or so)
2004-10-15 20:52:47 +00:00
Ian Romanick
0648794518 Add support for optimized versions of the code underlying ReadPixels
(and DrawPixels).  The R200, R128, and Unichrome drivers get support
in this commit.  Other drivers would be easy enough to add for people
that have the cards.

The DRI (CVS) build will need to be updated to account for the new
source files.
2004-10-14 00:59:12 +00:00
Keith Whitwell
dc45ee7a4b Add a license to this file. It was written on VA's watch, so they get
the honours.
2004-10-13 23:16:02 +00:00
Ian Romanick
07bd4c585c Added some documentation that I managed to figure out through
experimentation.
2004-10-13 22:38:31 +00:00
Ian Romanick
82f2e80f14 Make the GL_RENDERER string include the actual chipset information
instead of always saying "CLE266".
2004-10-13 22:36:26 +00:00
Ian Romanick
447cdd536f Initial support for PowerPC specific code in Mesa and DRI drivers. DRI
drivers built on PowerPC systems should now show things like "PowerPC" or
"PowerPC/Altivec" in the GL_RENDERER string.

The VMX moniker is used for Altivec/Velocity Engine/VMX SIMD additions.  I
chose this not because I work for IBM but because it's a LOT shorter to
type. :)
2004-10-13 19:56:15 +00:00
Ian Romanick
b72ed81818 Refactor the code in driGetRendererString a bit to make it easier to
add support for features of non-x86 CPU types.
2004-10-13 19:23:26 +00:00
Brian Paul
f599716b93 updated fsv URL 2004-10-13 17:29:46 +00:00
Ian Romanick
81f67fc4e9 Eliminate the funky SSE exception test from DRI builds. It's not need
(see the comment in the code), and it's just annoying.
2004-10-13 17:29:33 +00:00
Brian Paul
612d5f6e84 initial 6.3 changes 2004-10-13 15:57:55 +00:00
Brian Paul
dfe508ca7a Fix minor fog / fragment program state bug.
Don't add diffuse and specular colors when using fragment program.
2004-10-13 15:54:48 +00:00
Adam Jackson
886df0926f Bug #1588: abort if no palette format matches. (Egbert Eich, Stefan Dirsch) 2004-10-13 14:33:49 +00:00
Philippe Houdoin
f58c61ddb5 Let's build again after the support for GL_ARB_draw_buffers was added. 2004-10-13 01:23:32 +00:00
Philippe Houdoin
d334067193 Fix a potential memory leak. 2004-10-13 01:17:52 +00:00
Philippe Houdoin
fd7f62a508 Forgot a contributor.
Update build requirements since we can build with BeOS vanilla gcc *and*
more recent gcc 2.95.3 versions (recommended for best performance).
2004-10-13 00:35:55 +00:00
Philippe Houdoin
ac855a6688 Implement BGLView::CopyPixelsIn/Out().
BGLView::ErrorCallback() is now actually called on error!
Plus usual minor changes.
2004-10-13 00:29:21 +00:00
Daniel Borca
701c289ff3 support for external libraries 2004-10-12 07:33:03 +00:00
Daniel Borca
3c9faa448c SWTC trick (disabled for now) 2004-10-12 07:32:11 +00:00
Daniel Borca
2bff8bd8de SWTC trick, enabled new extensions 2004-10-12 07:31:26 +00:00
Daniel Borca
92e1d5fd34 SWTC trick 2004-10-12 06:44:34 +00:00
Daniel Borca
65a9ca3381 bump version numbers to their real values 2004-10-12 06:43:57 +00:00
Daniel Borca
f5e7629685 doc update 2004-10-12 06:43:00 +00:00
Daniel Borca
189f7e31d6 avoid the patch if Mesa_DXTn flag is set 2004-10-12 06:42:02 +00:00
Daniel Borca
76908ab9d4 add more mess to the dynamic linking system 2004-10-12 06:41:20 +00:00
Daniel Borca
3d322f6c5e add newline to end of file 2004-10-12 06:37:18 +00:00
Felix Kuehling
def29a3f87 Fix strange white space that gcc didn't like. 2004-10-11 22:26:40 +00:00
Michal Krol
ab2c0bed5a Prefix operator and constructor keywords with two consequtive underscores
( __ ). This will be more compatible with glslang spec.
2004-10-11 15:06:02 +00:00
Michal Krol
ad22ce8143 Enable draw_buffers only if GL_ARB_draw_buffers string is
present in GL_EXTENSIONS string.
Parse OPTION ARB_draw_buffers.
2004-10-11 08:13:25 +00:00
Eric Anholt
739823d250 This statechange is vtx state, not tcl. 2004-10-09 23:29:07 +00:00
Eric Anholt
57f1b25caf Use the right FALLBACK macro for projtex so that projective textures actually
cause a fallback, and simplify the tmu handling a little.
2004-10-08 23:24:04 +00:00
Eric Anholt
ea6f4f6079 Add fallback debugging (R128_DEBUG=fall) output, and set DO_DEBUG=1 by default
so that we can use the env var to get output.  Add a no_rast driconf option to
force software fallbacks.
2004-10-08 23:03:38 +00:00
Eric Anholt
b4d269f35f Don't compile WriteMonoDepthSpan if HAVE_HW_DEPTH_SPANS is defined -- it won't
be used in that case, and it wanting WRITE_DEPTH was making r128 die on
the undefined symbol.
2004-10-08 22:21:09 +00:00
Eric Anholt
f6cdaa9c81 Add support for NV_blend_square, and print errors if an unsupported blend
function is used.
2004-10-08 21:37:08 +00:00
Ian Romanick
3eccddb746 Massively cleaned up the code that calculates front/back/depth buffer
pitch and size.  Cut out a bunch of dead code.

This fixes bugzilla #1555.
2004-10-08 01:15:52 +00:00
Ian Romanick
a2dc424acf Reject unsupported texture formats passed to glCompressedTexImage?D. This
fixes Mesa bug #1028405.
2004-10-08 01:03:10 +00:00
Ian Romanick
af0a4690db Add simple test program for Mesa bug #1028405. 2004-10-08 00:56:08 +00:00
Alex Deucher
cb1642a75c Apply Eric's stencil wrap patch (Eric Anholt) 2004-10-08 00:31:51 +00:00
Eric Anholt
d09209f553 Add Roland Scheidegger's S3TC patch. This patch does not implement the
(patented) S3TC/DXTC algorithms, but adds an option to dlopen a library module
providing functions to do so.  Because it uses dlopen, it is only enabled if
USE_EXTERNAL_DXTN_LIB=1 is defined (which is only in linux-dri config, so far).
It adds support for S3TC to several DRI drivers, and adds a DRI config option to
force enabling S3TC even if the software compression/decompression is
unavailable.  This may allow people to use apps that require S3TC even though
they don't have a license to implement the patented material themselves, if
those apps use precompressed textures.

Ideally we would get permission from the current holder of the patents to
implement the algorithm in Mesa, at which point the dlopen mess could go away.
Until then, this allows some to run applications they couldn't otherwise, and
hopefully will provide us with more push to get the final step of getting that
permission done.
2004-10-07 23:30:29 +00:00
Ian Romanick
554e5a2eaf Prevent Y-offset from exceeding valid range in texture upload code. This
fixes bugzilla #960.
2004-10-07 16:39:20 +00:00
Felix Kuehling
1695cfe991 Fix emitting fog without secondary color and vice-versa. 2004-10-07 10:07:35 +00:00
Karl Schultz
89353febc0 *** empty log message *** 2004-10-06 21:45:48 +00:00
Brian Paul
fb170c8bd7 more GL_ARB_draw_buffers updates from Michale Krol 2004-10-06 15:56:38 +00:00
Brian Paul
0b89f7a93a fix GetVertexAttrib problem 2004-10-06 15:52:43 +00:00
Ian Romanick
be50caa52c Convert tdfxDDInitExtensions to use driInitExtensions. 2004-10-06 02:02:53 +00:00
Daniel Borca
e9be96d39e put Rush in the list of supported HW 2004-10-05 08:43:22 +00:00
Daniel Borca
0efa4a8f96 stencil wrap works, either HW or SW (Ian Romanick) 2004-10-05 08:42:10 +00:00
Daniel Borca
cb932046a8 enable 2_0 extensions 2004-10-05 08:39:32 +00:00
Ian Romanick
617add69ca Use the driFillInModes utility function. 2004-10-04 22:58:39 +00:00
Ian Romanick
ee3b7e390a Also export fbconfigs with 0/0 depth/stencil modes. This fixes "driver
claims not to support visual 0xXX" warnings in X.org 6.8.1.
2004-10-04 22:23:29 +00:00
Ian Romanick
b82333db3e Add some Savage3D stencil documentation based on discussions during the
20-Sep-2004 #dri-devel meeting.
2004-10-04 17:17:49 +00:00
Brian Paul
ddfec59bcd make clean should remove depend.bak too (Sérgio Moneiro Basto) 2004-10-04 14:47:48 +00:00
Brian Paul
be76b7fe1e ARB_fp support for GL_ARB_draw_buffers (Karl Rasche) 2004-10-04 14:40:05 +00:00
Ian Romanick
00fb3a054a Set MaxTextureImageUnits and MaxTextureCoordUnits to match MaxTextureUnits.
This fixes bugzilla #1511.
2004-10-04 03:19:01 +00:00
Ian Romanick
5e243bd57e The alpha post-scale and the RGB post-scale were mistakenly reversed. 2004-10-04 02:54:49 +00:00
Eric Anholt
e8250c6271 Remove empty r128_vb.h. 2004-10-03 18:09:57 +00:00
Brian Paul
58d84409a3 put glapi_x86.S into the x86/ directory 2004-10-02 22:48:59 +00:00
Brian Paul
788ff5b5c7 remove unused413 stuff, glDrawBuffersARB uses that slot now 2004-10-02 22:47:48 +00:00
Brian Paul
feac4f6ba5 GL_ARB_draw_buffers 2004-10-02 22:43:44 +00:00
Brian Paul
3298ec4670 fix _DrawDestMask[0][0] typos 2004-10-02 22:38:43 +00:00
Brian Paul
53f82c5aad added support for GL_ARB_draw_buffers 2004-10-02 16:39:09 +00:00
Brian Paul
289ffee2a0 fix indentation 2004-10-02 15:56:50 +00:00
Brian Paul
cbef8c4776 fix a comment 2004-10-02 15:56:33 +00:00
Brian Paul
83fb8c34fb bump version to 6.3 2004-10-02 15:43:26 +00:00
Brian Paul
9cef3efc29 initial stuff for 6.3 2004-10-02 15:43:14 +00:00
Brian Paul
7e73b1afa2 a few more updates for the 6.2 release 2004-10-02 15:26:25 +00:00
Brian Paul
9ca8392484 fix LoadProgramNV regression when I had fixed the RefCount bug 2004-10-02 15:16:59 +00:00
Brian Paul
07dead7a51 added PBO known issues 2004-10-02 14:59:29 +00:00
Brian Paul
bdd3c2e44e set 6.2 release date 2004-10-02 14:56:17 +00:00
Eric Anholt
599ea624a3 If an application cleared before any state had been emitted, that clear would
happen before any state had been set, causing a hang later on.  Fix this by
calling r200Flush instead of FIREVERTICES (which checks if any state has been
emitted but not flushed, before calling Flush) in r200Clear.  While here, add
some more debugging info which was useful, and remove an unnecessary
save/restore in BackUpAndEmit.
2004-10-02 05:22:19 +00:00
Eric Anholt
e5856a2960 Convert Rage 128 over to t_vertex.c. While it's slightly slower (10% in ipers)
it's not that big of a deal in more normal apps, and axes a good bit of code.
And I assume that t_vertex will only get faster.  Removes ~43k from compiled
binary.

Tested with:	quake3, ut, ipers, texcyl, chromium, tuxracer, neverball (kinda)
2004-10-02 01:33:46 +00:00
Eric Anholt
fc552c530f Add an option for vertices emitted to be swapped CPU_TO_LE32, to be used by the
r128 code.
2004-10-02 01:28:38 +00:00
Ian Romanick
5b73371e05 Cut out all of the old texture environment code and rewrote it from
scratch.  There were just too many cut-and-paste errors in the code,
and it was too hard to follow.

This fixes Mesa bugzilla #1508.  #1509 is probably also fixed, but
I'd like to do some more testing before I close that particular bug.
Additionally, this cuts almost 4,600 lines of code from the driver.
2004-10-02 01:23:46 +00:00
Karl Schultz
7ff3c9e4fc minor updates and improvements 2004-10-01 21:22:10 +00:00
Karl Schultz
4c2fbb0538 Add the glut project to the demos workspace. 2004-10-01 20:55:23 +00:00
Karl Schultz
0303409732 Remove glut project from the Mesa workspace. This allows users to build
this entire workspace by only unzipping MesaLib.zip.  The project will
be moved to the demos workspace, which is contained in the MesaDemos zip
file.
2004-10-01 20:53:28 +00:00
Karl Schultz
786eef2b1e Add HP shared lib configs. 2004-10-01 20:19:16 +00:00
Karl Schultz
ba52e79b4e HP shared lib config 2004-10-01 20:18:42 +00:00
Ian Romanick
bf4b63f836 Replace the numerous switch-statements to derive GL_COMBINE post-scale
state with a function.  This function sets the bits correctly.  Did some
trivial refactoring on some of the GL_COMBINE code.

First pass at replacing classic texture environments with GL_COMBINE.
This is controlled by the EXPERIMENTAL_COMBINE_MODE define.
2004-10-01 18:32:25 +00:00
Karl Schultz
5e2e9ef45c fix problems in previous version 2004-10-01 16:29:39 +00:00
Karl Schultz
a16bdb5fb7 Enable builds on AIX 64-bit 2004-10-01 13:33:26 +00:00
Dave Airlie
75672d2e94 Fix mesa solo with doublebuffered apps, the drawable index/stamp weren't
being updated properly..
2004-10-01 04:34:01 +00:00
Ian Romanick
75e2f0698e Factored out code for setting texture coordinate wrap bits. Added support
for GL_ARB_texture_mirrored_repeat.  Enabled GL_NV_blend_square.  It has
always actually been supported.  Removed redundant EXT versions of ARB
extension strings.
2004-09-30 21:18:23 +00:00
Brian Paul
ba467e86fe set span.y prior to each span write in draw_depth_pixels, like Karl's other fix 2004-09-30 15:39:43 +00:00
Eric Anholt
6a2ca962db Bugzilla #1058: Fix some potential 64bit pointer issues by storing differences
between pointers in appropriate types.

Submitted by:	  Ronny V. Vindenes <s864@ii.uib.no>
2004-09-30 00:40:21 +00:00
Eric Anholt
7a086dc05e OK, one more time. Simplify the state-backup system by just storing the full
state in a ready-to-emit cmdbuf, which avoids the issue Nicolai Haehnle reported
where the check() could return differently during backup-and-emit than it should
have if it were called at the right time.  Move the lit emission before most of
the TCL state emission on r200, which fixes neverball issues.

Tested with:	r100/r200 with neverball, tuxracer, chromium, quake3, ipers
2004-09-30 00:08:05 +00:00
Karl Schultz
fa569c0a73 Fix bug in glDrawPixels when writing color indexed images on color indexed
devices.  In draw_index_pixels(), use the correct variables for the span Y
and span end values.
2004-09-28 18:53:44 +00:00
Nicolai Haehnle
f30d53e049 Initial revision 2004-09-28 10:59:23 +00:00
Daniel Borca
bbe364603c use GLuint instead of uint 2004-09-28 06:44:46 +00:00
Brian Paul
be91a0be58 version bump 2004-09-27 22:40:31 +00:00
Brian Paul
4f1e3709de change include of glx_mangle.h to match other headers 2004-09-27 22:40:22 +00:00
Brian Paul
44254d3acc remove beos/*.h files from tarball list 2004-09-27 22:38:47 +00:00
Brian Paul
c7a24118e2 bump minor version to 2 2004-09-27 22:38:25 +00:00
Brian Paul
293ad98510 VBO RefCount fix (David Reveman) 2004-09-27 16:19:17 +00:00
Daniel Borca
e60c9311da stencil wrap works, either HW or SW (Ian Romanick) 2004-09-27 07:23:20 +00:00
Eric Anholt
8018f7104b Bump driver_date for today's fixes. 2004-09-25 21:08:56 +00:00
Eric Anholt
97ac8282f5 Can't bail in sisDDLogicOpCode when logicop is off, because it's called with
GL_COPY to turn off logicop.  Fixes glean's logicop test.
2004-09-25 21:08:30 +00:00
Eric Anholt
18c459c10b Triangle stipple is a fallback, since we don't have code for the stippling.
Doesn't seem to help with glean's paths test, but I'm pretty sure it's correct.
2004-09-25 21:06:58 +00:00
Eric Anholt
5565d32b57 Correct a couple of comments. 2004-09-25 19:43:30 +00:00
Eric Anholt
7b363b0dd4 Fix SiS AGP vertex dispatch by not trying to emit 0 vertices, which would hang
the hardware.  Re-enable AGP by default.
2004-09-25 19:01:18 +00:00
Eric Anholt
d166f2bffd Add sis to the list of DRI drivers, since it had already been converted to the
new interface.
2004-09-25 16:56:58 +00:00
Eric Anholt
0a21a4aaf9 Refactor the linux-dri config files so that linux-dri-x86 inherits from
linux-dri.  Turn on -O by default (-O2 provides a slight improvement in
performance, at a large cost to debuggability).  Turn off -fPIC on x86 by
default.  Turn on -Wall, to catch more stupid mistakes.  This could be both done
cleaner, and done for more config files, but it works for me for now.
2004-09-25 07:11:12 +00:00
Eric Anholt
5562fe653c The previous code would emit a full set of state during the first EmitState on
a new cmdbuf, to ensure that state wasn't lost across UNLOCK/LOCK pairs (in the
case of context switching).  This was rather inefficient.  Instead, after
flushing a cmdbuf, mark the state as needing to be saved on unlock.  Then, at
the beginning of flushing a cmdbuf, if we actually have lost the context, go
back and emit a new cmdbuf with the full set of state, before continuing with
the cmdbuf flush.  Provides a 10-15% improvement in ipers performance in my
tests, along with other apps.

Tested with:	ipers, glxgears, quake3
2004-09-25 07:00:15 +00:00
Eric Anholt
4010481ba3 Fix texturing in quake3. Some code was left over from the dirty/clean list
setup that now removed atoms from the atomlist on texture deletion.
2004-09-25 06:12:40 +00:00
Eric Anholt
b4e2e9c65a Bump DRIVER_DATE for yesterday's changes. 2004-09-25 03:00:27 +00:00
Brian Paul
b45aaa2328 moved to demos/ directory 2004-09-24 23:01:21 +00:00
Brian Paul
7d01c3480d moved in from the tests/ directory to include in distro 2004-09-24 23:00:52 +00:00
Brian Paul
58be9e6c37 updated osmesa info 2004-09-24 20:31:02 +00:00
Brian Paul
328a039413 patches for clearing hw depth buffers from software fallback (Nicolai Haehnle) 2004-09-24 14:30:13 +00:00
Daniel Borca
d9873c59ef added (back!) option to use non-packedcolor 2004-09-24 07:03:53 +00:00
Eric Anholt
303c342d53 -O -Wall warnings cleanups in r200. 2004-09-24 04:20:58 +00:00
Eric Anholt
cddd5c99e5 Clean up some warnings in the R100 driver with -O -Wall. 2004-09-24 03:09:49 +00:00
Eric Anholt
106ab07acd Remove an unnecessary calculation of the dest pointer. 2004-09-24 01:33:15 +00:00
Brian Paul
529e0a98d4 don't test for NULL pixels pointer here, do that in the 'store' routines after validating PBO address 2004-09-23 17:34:52 +00:00
Brian Paul
1fd4a55d09 removed hacked GL tokens, fixed a printf 2004-09-23 17:32:12 +00:00
Brian Paul
7e0c5888ea added a comment in BindTexture 2004-09-23 17:31:21 +00:00
Brian Paul
7287bbf4fc just some comments and formatting changes 2004-09-23 17:30:54 +00:00
Dave Airlie
a1f8ecf962 fix for Erics new emit state code, rework out the dest pointer
after we check the buffer
2004-09-23 08:24:03 +00:00
Eric Anholt
0c8f8d3dc9 The previous code would emit a full set of state during the first EmitState on
a new cmdbuf, to ensure that state wasn't lost across UNLOCK/LOCK pairs (in the
case of context switching).  This was rather inefficient.  Instead, after
flushing a cmdbuf, mark the state as needing to be saved on UNLOCK.  Then, at
the beginning of flushing a cmdbuf, if we actually have lost the context, go
back and emit a new cmdbuf with the full set of state, before continuing with
the cmdbuf flush.  Also, remove the dirty/clean atom lists, since atoms are
emitted in a fixed order these days, and go with a simpler single list.

Provides a 14% improvement in ipers performance in my tests, along with other
apps.
2004-09-22 06:27:02 +00:00
Dave Airlie
029ee9c680 Add xmlconfig to the i810 makefile 2004-09-21 00:39:59 +00:00
Daniel Borca
e2b13e4af3 clamp size of wide points 2004-09-20 08:33:38 +00:00
Ian Romanick
c59270e2b8 Add GL_ARB_texture_cube_map support for i830. Most of the code was
lifted from the i915 side.  i830 will now report version 1.3!  Hurrah!
With the exception of GL_EXT_texture_compression_s3tc, the i830 driver
now supports all the extensions that its Windows counterpart supports.
2004-09-19 08:03:46 +00:00
Ian Romanick
b9bbe78031 Added GL_ARB_point_parameters support for i830. 2004-09-19 07:15:38 +00:00
Ian Romanick
be3359bad5 Merge in all the i830 functional differences from the old i830 driver. 2004-09-19 07:01:26 +00:00
Karl Schultz
ffe52c6444 rearrange a couple of lines of code to avoid compilation error in VC 6,
probably due to a compiler bug.
2004-09-17 22:02:05 +00:00
Eric Anholt
6616146698 Symbol names are prepended with an underscore on CYGWIN as well.
X.Org Bugzilla:	1079
Submitted by:	Alexander Gottwald <ago@freedesktop.org>
2004-09-17 05:10:33 +00:00
Brian Paul
a511b70f44 silence warnings 2004-09-16 19:40:22 +00:00
Brian Paul
37c0497d98 silence warnings, re-indent code 2004-09-16 19:39:04 +00:00
Brian Paul
4ebf9590c3 VBO refcount and spriteblast fixes 2004-09-16 19:33:44 +00:00
Brian Paul
6fedd4e3bf clean-up the hokey transformation code so that window resizes actually work 2004-09-16 19:32:49 +00:00
Brian Paul
b18715fea3 replace glNormal3f(v) with GL_CALL(Normal3f)(v), etc (Andreas Stenglein 2004-09-15 14:49:33 +00:00
Brian Paul
d4aaa68979 in _mesa_problem() include version number in error message 2004-09-15 14:40:14 +00:00
Brian Paul
765f1a12c6 also fix possible delete bugs with buffer objects and vertex/fragment programs 2004-09-14 22:28:27 +00:00
Brian Paul
8de924dbb0 fixed glDeleteTextures bug 2004-09-14 20:43:22 +00:00
Brian Paul
6917201ede Have the rendering contexts share textures.
Put simple checker pattern on the objects.
Press 'd' to delete texture, 'u' to unbind it.
2004-09-14 20:42:53 +00:00
Brian Paul
f18fc68707 Repeatedly deleting a texture ID with glDeleteTextures() could lead to a crash.
Added a DeletePending flag to texture object struct to fix that.
Other misc clean-ups.
2004-09-14 20:40:55 +00:00
Brian Paul
d84f09306c Replace -lGL with -l$(GL_LIB), etc.
Remove GLU_LIB_DEPS, OSMESA_LIB_DEPS lines if identical to 'default' file.
2004-09-13 21:04:48 +00:00
Brian Paul
86cdad1b2f added GL_MAX_VERTEX_ATTRIBS_ARB bug fix 2004-09-13 19:59:06 +00:00
Brian Paul
c3912b66ab Handle GL_MAX_VERTEX_ATTRIBS_ARB in glGet*().
Define 2.0 point-sprite related tokens in glheader.h (temporary).
2004-09-13 19:58:27 +00:00
Ian Romanick
4ef9ad22ae Minor extension string tweaks. Added support for vertex program extensions.
Tested with arbvptorus, arbvpwarpmesh, vptorus, and vpwarpmesh.
2004-09-13 16:36:44 +00:00
Brian Paul
051f6a5cb0 remove ARB_texture_non_power_of_two from _mesa_enable_1_5_extensions() 2004-09-13 14:55:07 +00:00
Brian Paul
1fcac8b1c1 adjust texcoords for texture rectangle sampling 2004-09-13 14:54:19 +00:00
Brian Paul
114246eb86 tweak texcoord for sampling texture rectangles (Dave Reveman) 2004-09-13 14:53:02 +00:00
Daniel Borca
b66f674410 cleanup and bugfixes for fxDDClear() 2004-09-13 09:31:28 +00:00
Daniel Borca
802632e62d cleanup and some changes towards GL_ARB_point_sprite (two-zero) 2004-09-13 09:29:30 +00:00
Daniel Borca
eabfd43ad4 cleanup 2004-09-13 09:27:03 +00:00
Daniel Borca
a9ea1628da changes towards GL_ARB_point_sprite (two-zero) 2004-09-13 08:47:01 +00:00
Brian Paul
e54464e9d3 updated ggi files in tarball list 2004-09-10 22:13:18 +00:00
Brian Paul
89ac4fc6bf applied patch #1026109 2004-09-10 22:12:36 +00:00
Brian Paul
0479ce06d4 updated from patch 1026109 2004-09-10 22:12:14 +00:00
Brian Paul
5cc7111f72 new file (bug 1026109) 2004-09-10 22:11:33 +00:00
Brian Paul
0a55db041d removed (bug 1026109) 2004-09-10 22:08:33 +00:00
Brian Paul
a290fd6aa1 ggi updates 2004-09-10 19:20:56 +00:00
Brian Paul
0cabfa68c3 assorted updates (bug #1025977) 2004-09-10 19:19:24 +00:00
Brian Paul
e14c225597 misc updates for 6.2 release 2004-09-10 16:42:40 +00:00
Brian Paul
8a970af976 updated error msg 2004-09-10 14:41:55 +00:00
Jose Fonseca
a9a155e574 Use CSS in custom headers. 2004-09-10 11:47:51 +00:00
Brian Paul
5c6ede2060 fix matrix classification and program parsing error state bugs 2004-09-10 01:07:05 +00:00
Brian Paul
7f76b8ffd1 reset error state before parsing (David Reveman) 2004-09-10 01:05:39 +00:00
Brian Paul
253204f9f0 More updates for Doxygen. 2004-09-10 00:45:12 +00:00
Brian Paul
7e5c452efb added glapi and shader modules, misc updates 2004-09-10 00:44:09 +00:00
Jose Fonseca
375457bcef Update the doxygen configuration file.
Minor updates/fixes to the source documentation.
2004-09-09 22:23:24 +00:00
Brian Paul
2dab997cb9 fix a bug in analyse_from_scratch() reported by Wes Bethel 2004-09-09 19:58:03 +00:00
Brian Paul
7dc9a8827d clean-ups and comments 2004-09-09 19:57:26 +00:00
Brian Paul
281f855629 initial bits for DRI_FILES for putting DRI driver sources into the tarball 2004-09-09 18:17:36 +00:00
Brian Paul
d86d1483ac Another attempt at fixing name mangling and gl__unused413(). 2004-09-09 18:13:35 +00:00
Dave Airlie
c18fe0c92b updated patch for vertex program 2004-09-08 08:51:12 +00:00
Dave Airlie
0866b67fdb This patch enables GL_ARB_vertex_program and GL_NV_vertex_program
support in the r200 driver. Both extensions can be enabled via
options, GL_ARB_vertex_program is on by default, GL_NV_vertex_program
off. Option descriptions are in german, english and french.

From: Philipp Klaus Krause
2004-09-07 09:56:19 +00:00
Dave Airlie
e520b72e89 Add a solo-x86 config, and make solo use the x86 glapi 2004-09-07 00:41:40 +00:00
Daniel Borca
58c4937e12 make sure the HW is clean before shooting the pipeline 2004-09-03 06:32:18 +00:00
Keith Whitwell
f3d960054e r200-maybe-flush-less-3.diff 2004-09-02 07:33:41 +00:00
Brian Paul
72b395fbba also test for __arm__ for setting USE_IEEE (X bug 1155) 2004-09-01 04:36:29 +00:00
Keith Whitwell
535408adda The i915 driver was merged after EMIT_*_BGR bug was fixed. This brings
the driver into line with the correct meaning of those symbols
and fixes color corruptions.
2004-08-31 11:36:14 +00:00
Daniel Borca
c372549036 newer Glide3x snaps vertices internally for V1/VR/VB 2004-08-31 06:34:51 +00:00
Daniel Borca
2b0f589328 document MESA_FX_NOSNAP 2004-08-31 06:32:34 +00:00
Brian Paul
dbc4830d87 updated CFLAGS (Anich Gregor) 2004-08-30 20:53:49 +00:00
Daniel Borca
171614abbd remove CR 2004-08-30 09:10:34 +00:00
Daniel Borca
367850dbfe cleanup 2004-08-30 09:06:27 +00:00
Daniel Borca
7a42f1562d revived unused code, but got rid of warnings 2004-08-30 09:05:01 +00:00
Daniel Borca
5b2434c5d1 cleaned up extensions a bit 2004-08-30 08:44:32 +00:00
Daniel Borca
d4462dc975 clamp lodbias 2004-08-30 08:43:26 +00:00
Daniel Borca
d17c1769ca fixed automatic mipmap generation 2004-08-30 08:41:25 +00:00
Daniel Borca
554321af7b fog really needs W 2004-08-30 08:40:05 +00:00
Daniel Borca
b1f709cc88 remove CR 2004-08-30 08:37:57 +00:00
Daniel Borca
eec588be6f Werror is bad, unless you know what you are doing 2004-08-30 08:34:52 +00:00
Brian Paul
a5bc6421df bump version to 6.2, add installmesa to tarballs 2004-08-27 15:31:20 +00:00
Brian Paul
a9aa19e4ce ICD update from Gregor Anich 2004-08-25 22:57:20 +00:00
Brian Paul
b7d048405c move (void) foo; instances after local declarations 2004-08-25 19:12:35 +00:00
Brian Paul
d0bdae8a28 print internalFormat value in r200ChooseTextureFormat() error message 2004-08-25 17:36:34 +00:00
Brian Paul
a6c423d956 Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696) 2004-08-25 15:59:48 +00:00
Brian Paul
866286936a regenerated with license info 2004-08-25 15:33:49 +00:00
Brian Paul
0e9929ac10 Makefile for python-generated files (Ian Romanick) 2004-08-25 15:33:11 +00:00
Brian Paul
cd24885429 use version generated from the XML database 2004-08-25 15:22:35 +00:00
Brian Paul
d99e5505f3 fix MGL namespace warning (patch 1014800) 2004-08-25 15:20:56 +00:00
Brian Paul
9554411af6 return type for MapBuffer was not specified 2004-08-25 15:19:40 +00:00
Brian Paul
5920b722b7 Fix mgl name mangling (patch 1014800) 2004-08-25 15:10:51 +00:00
Brian Paul
86e001b78c Windows ICD driver code (patch 1014800) 2004-08-25 14:59:45 +00:00
Brian Paul
7c544d3685 fix a couple bad casts 2004-08-25 14:52:01 +00:00
Brian Paul
be9b759ab0 remove BeOS conditional code. oglinfo should be moved to xdemos since it's a GLX program 2004-08-25 14:51:18 +00:00
Brian Paul
0ad6554338 print current config name before building src and progs 2004-08-25 14:49:41 +00:00
Brian Paul
3b550e1e3c work around a param bug (Adam Jackson) 2004-08-25 14:39:40 +00:00
Philippe Houdoin
f43cc67616 Disable x86 iround() version on BeOS with gcc < 2.95.x, as it choke GAS.
BTW, that's remove the requirement to build Mesa on BeOS with gcc 2.95.3.
Still recommanded for performance, thought ;-)
2004-08-24 08:54:04 +00:00
Philippe Houdoin
0f539de57e Todo list updated. Build instructions detailed. 2004-08-24 08:31:57 +00:00
Philippe Houdoin
b227e90837 Duplicate CFLAGS in CXXFLAGS removed. Now define DEBUG symbol in debug build. 2004-08-24 08:17:08 +00:00
Felix Kuehling
c2530b5730 Converted the Savage driver to the new DRI interface and enabled compilation
in the Mesa tree.
2004-08-22 20:31:40 +00:00
Brian Paul
b1e178c69b release notes for 6.2 2004-08-22 17:43:31 +00:00
Brian Paul
b0f08737ba IRIX fixes 2004-08-22 17:42:03 +00:00
Brian Paul
9debd5620d added src/glw/depend to tarball list 2004-08-22 17:41:44 +00:00
Brian Paul
17386de1d9 cast to fix a warning (in disabled code anyway) 2004-08-22 17:24:27 +00:00
Brian Paul
bc3a5336d9 don't use __FUNCTION__ - not portable 2004-08-22 17:23:22 +00:00
Brian Paul
370b47802e check if __mips or _MIPS_ARCH is defined to set IEEE_ONE (bug 1003026) 2004-08-22 16:57:40 +00:00
Brian Paul
5f9c21ae67 also check for __hppa__ and hpux for IEEE support (bug 1003026) 2004-08-22 15:19:03 +00:00
Brian Paul
edfe0fe78b enabled GL_ARB_texture_rectangle 2004-08-20 14:21:20 +00:00
Daniel Borca
d4edb53201 hide GL_ARB_texture_compression from non-VSA cards 2004-08-20 08:34:30 +00:00
Daniel Borca
14c532f767 cleanup 2004-08-20 08:29:24 +00:00
Brian Paul
e4a4d04170 first bug fix for v6.2 2004-08-19 18:34:41 +00:00
Brian Paul
b160cbf87a bump version to 6.2 2004-08-19 18:34:15 +00:00
Brian Paul
a1dad07249 don't check for ARB_texture_non_power_of_two for OpenGL 1.5 (Philipp Klaus Krause) 2004-08-19 18:33:13 +00:00
Jouk Jansen
b8e148c2c9 Committing in .
Missing .'s

 Modified Files:
 	Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-08-19 14:21:18 +00:00
Daniel Borca
5d0efec190 why is GL_ARB_texture_env_combine different from EXT? 2004-08-19 06:59:05 +00:00
Daniel Borca
50a84ce41e "const int _nc" was really stupid... 2004-08-19 06:58:00 +00:00
Daniel Borca
55497973be cleanup 2004-08-19 06:56:51 +00:00
Daniel Borca
fd9757d3b9 silence compiler warnings 2004-08-19 06:51:48 +00:00
Brian Paul
740cbb1559 added Mesa 6.1 release info 2004-08-18 22:41:09 +00:00
Brian Paul
efb2ade520 check for either GL_NV_vertex_program or GL_ARB_vertex_program for some enables 2004-08-18 18:45:25 +00:00
Brian Paul
e41460bf77 updates from Jouk 2004-08-18 14:47:16 +00:00
Brian Paul
6aa5b4cb91 set release date for 6.1 2004-08-17 22:58:23 +00:00
Eric Anholt
626f825bcc Revert the move of lost_context setting to UNLOCK_HARDWARE that was done in the
last commit.  I've been convinced by keithw that it's sufficient, and put a note
in the code about it.

Close another race for state in the Clear functions.  I made the situation worse
in my last commit, but this should fix things.  Might be a slight performance
hit, which could be regained by splitting the R*_FIREVERTICES calls in r*Clear
up so that the EmitState doesn't happen in a separate new cmdbuf.
2004-08-17 20:10:29 +00:00
Brian Paul
ffdea1ae80 don't enable the float texture and GLhalf pixel extensions yet 2004-08-17 19:25:55 +00:00
Ian Romanick
6fc61be869 Fixed an assembler warning / error (depending on the version of GAS used).
Fixed a crash in the optimized pthreads dispatch path.
2004-08-17 17:03:24 +00:00
Brian Paul
51830613a9 some updated info about adding new extensions 2004-08-17 14:08:59 +00:00
Eric Anholt
6f3cc6a522 Close some races with locking on R100 and R200 which could manifest as rendering
errors on r100 and rendering errors and hangs on r200 (same for R100 without
OLD_PACKETS).

If a command buffer filled after some state (EmitState or a VBPNTR write) was
emitted, the lock was grabbed, the buffer flushed, a new buffer prepared, and
the lock dropped.  Another client could come in, set its own state as part of
rendering, and when the first client flushed the rendering commands depending
on the previous state, it got the 2nd client's state.  This is fixed by checking
for enough space before beginning a set of state emits and rendering, and
flushing the buffer first if so.  This guarantees that the buffer won't wrap.

Also, move the "lost_context = 1" from the end of cmdbuf flushing to
UNLOCK_HARDWARE for clarity (at a minimum) that any time the lock is dropped,
state may get overwritten.  We don't have enough information at the point of the
LOCK_HARDWARE to reset our state to the last UNLOCK_HARDWARE point in the case
that we did lose our context, but saving the information to rebuild that state
may be a useful optimization (ipers data suggests up to 5%).
2004-08-17 01:41:29 +00:00
Brian Paul
7e27ab4c6a whitespace clean-up, new 'clean' commands 2004-08-16 17:11:10 +00:00
Daniel Borca
153f479697 prepared for release 2004-08-16 08:47:19 +00:00
Philippe Houdoin
479b3d0745 Add glutGetProcAddress(). Not all GLUT version 5 APIs are supported yet, thought.
-> #define GLUT_API_VERSION 4.5 ? ;-)
2004-08-16 08:46:38 +00:00
Philippe Houdoin
375047ba72 make clean at root now clean the glu/$(GLU_DIRS) too. 2004-08-16 08:42:05 +00:00
Philippe Houdoin
ac07d89fd3 Stupid me. I don't know why I moved the GLView.h here at first, but now I know why
I shouldn't:
Official BeOS GLView.h defines a virtual ErrorCallback(GLenum) method, assuming
a unsigned long GLenum.
But under Mesa, GLenum is unsigned int.
To keep binary compatibility, BeOS apps including Mesa GL/gl.h MUST include *our*
GLView.h, or linker will report a missing ErrorCallback(unsigned int) symbol. Glup.
2004-08-16 08:39:36 +00:00
Daniel Borca
ddff352586 cleanup 2004-08-16 08:34:13 +00:00
Daniel Borca
624477afbb fixed texture fetchers, fixed automatic mipmap generation, some cleanup 2004-08-16 08:32:06 +00:00
Daniel Borca
cd643491ad fixed pixel drawing routines, some cleanup 2004-08-16 08:30:41 +00:00
Daniel Borca
616a5b64f9 disabled stereo checking in wglChoosePixelFormat 2004-08-16 08:01:43 +00:00
Philippe Houdoin
a95aba7d1f Clearer guard message text. 2004-08-16 07:46:28 +00:00
Eric Anholt
0de671f19a Remove unused HAVE_INDEX define. 2004-08-16 04:38:48 +00:00
Philippe Houdoin
4ad28c9d9a GLInfo now show GLU and GLUT infos too. Fix the includes paths 2004-08-15 14:06:00 +00:00
Philippe Houdoin
af2f26f7de Obsoleted as demos programs build on BeOS with standard Makefile system. 2004-08-15 11:43:47 +00:00
Brian Paul
98ae32c0f7 fix swrast/shader typo 2004-08-14 21:53:14 +00:00
Karl Schultz
d48ef3ebe7 add shader.dsp and descrip.mms to tarball list for relatively new shader dir. 2004-08-14 21:42:50 +00:00
Brian Paul
244af16c43 updated tarball list for BeOS changes 2004-08-14 21:12:37 +00:00
Karl Schultz
931ef21c42 Update Visual Studio Project file for src tree updates. 2004-08-14 20:07:01 +00:00
Karl Schultz
7a7e04039e New Visual Studio project file for this directory. 2004-08-14 20:02:59 +00:00
Karl Schultz
cec756ae3a Minor tweaks to deal with vsnprintf and __FUNCTION__ on WIN32 2004-08-14 19:28:48 +00:00
Brian Paul
4d69189ac0 minor update to intro, and some word wrapping 2004-08-14 15:23:51 +00:00
Brian Paul
946765a95f BeOS updates, memory leak fix, updated release notes 2004-08-14 15:21:17 +00:00
Brian Paul
b784b8f21f indentation fixes 2004-08-14 14:30:36 +00:00
Philippe Houdoin
25f2d96a8f Turn gcc optimization up to -O3. 2004-08-14 14:29:21 +00:00
Brian Paul
21841f0ae5 fix some memory leaks (bug #1002030) 2004-08-14 14:28:11 +00:00
Philippe Houdoin
f226191d52 Remove obsoleted BeOS-specific makefiles.
Add a makefile to build old Mesa GLU, whatever it worth.
Add a guard to stop building libGLU.so on BeOS, as it's build into libGL.so.
2004-08-14 14:27:32 +00:00
Philippe Houdoin
92cb914321 Add a guard to stop building libGLU.so under BeOS, as it's build into libGL.so. 2004-08-14 14:24:48 +00:00
Philippe Houdoin
8c6f59ce54 Forgot to commit this valuable file! :-) 2004-08-14 14:22:35 +00:00
Philippe Houdoin
18985fb231 Remove obsoleted BeOS-specific makefile as the main Makefile system now
support BeOS platform too.
2004-08-14 10:49:31 +00:00
Philippe Houdoin
b8b12a9933 Replaced the .cpp-ized (for build issue) common GLUT source files by their
standard .c version.
Remove unused libglut.def.
2004-08-14 10:42:57 +00:00
Philippe Houdoin
bba512b75b Replaced the .cpp-ized (for build issue) common GLUT source files by their
standard .c version.
Remove outdated Makefile.orig.
2004-08-14 10:37:03 +00:00
Philippe Houdoin
a041e62418 Update to Jake Hamby's BeOS GLUT 3.7 port. 2004-08-14 10:27:08 +00:00
Philippe Houdoin
fad0e5d448 Move to $(TOP)/configs/default-based makefile. 2004-08-14 10:21:08 +00:00
Philippe Houdoin
ef4dd5ad79 Update BeOS mklib to set mimetype and version.
Static lib build support added.
2004-08-14 10:12:38 +00:00
Philippe Houdoin
92ec9975fe BeOS now officially moved to main Makefiles chain. To build under BeOS: "make beos" 2004-08-14 10:10:42 +00:00
Philippe Houdoin
b44cf6df1c Updated according to new way to build under BeOS. 2004-08-14 10:06:21 +00:00
Philippe Houdoin
789dd56699 Obsolete the BeOS-specific makefile as we now build using standard Makefiles chain. 2004-08-14 10:05:33 +00:00
Philippe Houdoin
ea446b56ab Obsolete BeOS-specific makefile.
Removed the oglinfo target from samples from BeOS build, as it depends on X.
2004-08-14 10:03:11 +00:00
Philippe Houdoin
f17ddd4884 Fix demo.cpp, which wasn't working as expected.
Add a GLInfo app, a graphical tool displaying GL Info as a treeview.
Usefull to see which OpenGL renderer you use and which extension(s) is supported.
Convert the Makefile to be $(TOP)/configs/default-based.
2004-08-14 09:59:16 +00:00
Philippe Houdoin
41ea155878 Obsoleted. Now, the BeOS targets build by main Makefiles chain. 2004-08-14 09:52:18 +00:00
Philippe Houdoin
428be67663 Silent compiler "variable may be used uninitialized" warnings. 2004-08-14 09:51:30 +00:00
Philippe Houdoin
b4907820c2 BeOS's _glthread_DECLARE_STATIC_MUTEX() couldn't be used outside a function
because she called create_sem(). Now the semaphore creation is made at first
_glthread_LOCK_MUTEX() call.
2004-08-14 09:48:57 +00:00
Philippe Houdoin
4b3be4d8be Fix a bug that set RGBA bits length always to 0 (reported by Marcin Konicki).
PPC byte order now supported (thanks Nathan Whitehorn).
Double buffering is now always forced.
Unlock the BGLView looper only if needed. Should fix the GLUT-based apps crash
at window closing.
SwapBuffers() now can wait for next vertical retrace.
And several other minor changes...
2004-08-14 09:43:07 +00:00
Dave Airlie
7b0c30574c build fix from XFree86 tree 2004-08-14 09:29:24 +00:00
Philippe Houdoin
3184830487 Move BeOS build into main Makefiles chain. 2004-08-14 09:23:09 +00:00
Philippe Houdoin
af8031ce5c Add a BeOS build config. 2004-08-14 09:18:04 +00:00
Dave Airlie
1cdfb69116 bring over change from xorg trunk - let build on non-i386 2004-08-14 09:09:56 +00:00
Dave Airlie
56999adb21 bring over build fix from xorg tree 2004-08-14 09:08:27 +00:00
Brian Paul
b1872fed15 silence a warning 2004-08-13 21:05:02 +00:00
Brian Paul
2fe6e913ca minor fix for newest glxext.h header 2004-08-13 21:04:04 +00:00
Brian Paul
02ca8fe85d added some missing sources to tarball list 2004-08-13 20:58:59 +00:00
Eric Anholt
b292642de0 Fix dri_util.c build with new headers.
Submitted by:	John Lightsey <john@nixnuts.net>
2004-08-12 21:50:03 +00:00
Brian Paul
3bbdcdcdb8 cvs ignore file 2004-08-10 15:42:14 +00:00
Brian Paul
d462841384 updated glext.h and glxext.h files 2004-08-10 15:40:20 +00:00
Brian Paul
52a5cc0bae minor anim tweak 2004-08-10 15:39:00 +00:00
Brian Paul
5222662f52 silence warning 2004-08-10 15:36:46 +00:00
Brian Paul
16c8dce363 use 'a' to toggle animation 2004-08-10 15:36:31 +00:00
Brian Paul
47a6749b33 minor tweaks 2004-08-10 15:34:51 +00:00
Brian Paul
f2afdcae9a query/print max convolution filter size 2004-08-10 15:32:25 +00:00
Brian Paul
dfbb84ea2c added some handy debug code (disabled) 2004-08-10 15:30:41 +00:00
Brian Paul
cec85c778f added a few more debug printfs (disabled) 2004-08-10 15:30:16 +00:00
Jon Smirl
521ebf670a Fix from Rogelio Serrano for miniglx double buffering 2004-08-09 22:14:57 +00:00
Roland Scheidegger
8bd0a627fd fix incorrect overflow detection when emitting R200_SS_MAT_1_SHININESS 2004-08-03 13:03:33 +00:00
Dave Airlie
a032297b32 xorg-r200-uninitialized-variable-used.patch from Redhat xorg 2004-07-31 08:14:50 +00:00
Daniel Borca
d9166e132e disabled automatic mipmaps until we can handle 565 textures. 2004-07-29 08:31:26 +00:00
Daniel Borca
10e768c11b fixed conflict between depth & alpha in 16bpp 2004-07-29 08:25:03 +00:00
Brian Paul
0a10abf93e vtk and Paraview links updated 2004-07-28 15:55:13 +00:00
Brian Paul
6ade8a36b6 version 6 from oss.sgi.com 2004-07-28 13:23:11 +00:00
Brian Paul
196fb036d6 version 24 from oss.sgi.com 2004-07-28 13:22:46 +00:00
Brian Paul
c2800e08ec don't use GLuint or GLvoid in function declaration 2004-07-27 16:32:37 +00:00
Daniel Borca
27df1ec1cd disable W1 when single-texturing 2004-07-26 15:10:34 +00:00
Brian Paul
146852881f consistantly use unpack parameter, instead of ctx->Unpack (Daniel Borca) 2004-07-26 15:09:22 +00:00
Felix Kuehling
fff87eecbe Fixed hash table allocation to avoid an assertion failure due to a
bad config file. Fixed two more typos.
2004-07-26 12:42:36 +00:00
Daniel Borca
dec1191d45 Rush is back on ZBUFFER
added DrawPixels555 and DrawPixels565
2004-07-26 08:04:22 +00:00
Brian Paul
6b41bf3afc use GL_CALL() macro (Andreas Stenglein) 2004-07-24 15:18:36 +00:00
Brian Paul
dfa5c2bfbb new MESA_GLX_DEPTH_BITS env var 2004-07-23 23:32:15 +00:00
Brian Paul
eae26ca4ba minor comments 2004-07-23 22:56:29 +00:00
Brian Paul
840565cd47 updates from Stephane Marchesin 2004-07-23 19:30:33 +00:00
Brian Paul
4f6b1ad952 added MESA_GLX_FORCE_ALPHA env var 2004-07-23 15:49:12 +00:00
Brian Paul
a13331d59b added support for MESA_GLX_FORCE_ALPHA env var 2004-07-23 15:47:04 +00:00
Brian Paul
b8f29f29eb ALIGN16 macro repairs 2004-07-23 15:45:56 +00:00
Daniel Borca
a48edcf69c fixed pixelpiped DrawBitmap / DrawPixels (clipping was upside-down) 2004-07-23 08:59:09 +00:00
Daniel Borca
1635040a9e partial GL_BLEND for Voodoo1 2004-07-21 08:46:55 +00:00
Daniel Borca
15a0b086b4 minor doc update 2004-07-21 08:45:35 +00:00
Daniel Borca
1b868b1e54 fixed a bug in clear routine 2004-07-21 08:44:26 +00:00
Brian Paul
782a32b847 fix compare w/ zero warnings (bug 988766) 2004-07-20 21:16:07 +00:00
Brian Paul
5fe90292f8 error message fixups and some debug code 2004-07-20 21:15:13 +00:00
Brian Paul
bd997cd11f fix compare w/ zero warnings (bug #988766) 2004-07-20 21:12:56 +00:00
Brian Paul
5f3b3a3827 new image (see mesa bug #993926) 2004-07-20 21:00:34 +00:00
Brian Paul
9408fe0c09 remove -lXm (motif) from GLW_LIB_DEPS since it's not needed by default 2004-07-20 20:43:24 +00:00
Daniel Borca
6beec97521 GL_EXT_texture_env_add shouldn't be conditioned by multitex, or should it? 2004-07-20 10:33:21 +00:00
Daniel Borca
e7e86eaf3e trying vertex_program... 2004-07-19 14:08:46 +00:00
Daniel Borca
1c2a498119 several new bugs 2004-07-19 08:06:00 +00:00
Daniel Borca
25f0e8227f minor corrections 2004-07-16 07:54:46 +00:00
Daniel Borca
1ff6188c09 GL_MODULATE/GL_REPLACE multitex (wasteful, but apparently needed by some apps) 2004-07-16 07:53:53 +00:00
Daniel Borca
0f7eb92249 SGIS_generate_mipmap 2004-07-16 07:53:02 +00:00
Jon Smirl
dc8a7603a3 Miniglx clients now authorize with server DRM 2004-07-16 04:27:00 +00:00
Dave Airlie
84e6b16d8f add debugging for compresssed textures 2004-07-15 10:51:17 +00:00
Dave Airlie
c058917343 fix up heights for i830/i915 texture compression 2004-07-15 10:47:13 +00:00
Dave Airlie
78e19b5f98 move config options to same place as other drivers (again for S3TC patch later) 2004-07-15 08:50:27 +00:00
Dave Airlie
620c998b16 use a switch statement makes integrating the s3tc patch easier 2004-07-15 08:41:26 +00:00
Dave Airlie
11a03a18ad enable FXT1 texture compression for ixxx chipsets
commented out Keiths extensions strings
2004-07-15 08:08:44 +00:00
Dave Airlie
43942fd5e3 move over changes to intel driver from i830 driver for modes 2004-07-15 06:29:16 +00:00
Daniel Borca
ba3d088e27 fixed vertex RGBA 2004-07-13 06:45:56 +00:00
Jon Smirl
9a9614e4e9 Make solo radeon/r128 drivers track fix for DRI bug 849 2004-07-10 21:17:52 +00:00
Jon Smirl
bdf3e2ba1f Remove DRM_PAGE_SIZE from fb and i810 drivers since it was being used. 2004-07-10 19:14:18 +00:00
Jon Smirl
65293d8f73 Fix unichrome solo build to not need X11 headers. Minor change to
use mesa_alloc/free.
2004-07-10 17:09:57 +00:00
Felix Kuehling
486e5c26dc Make GET_PROGRAM_NAME work with uCLibc using the __progname hack.
Improved that hack to remove leading directory names.
2004-07-10 11:25:02 +00:00
Jon Smirl
368f3c551b Fix mesa-solo config to define _GNU_SOURCE so that program_invocation_short_name
will be correctly defined.
2004-07-09 18:46:51 +00:00
Daniel Borca
d53d429ed2 use tnl_emit_func, it's safer 2004-07-06 12:37:09 +00:00
Roland Scheidegger
d2dbb25372 correct X86_DISPATCH_FUNCTION_SIZE if THREADS is defined 2004-07-06 00:32:03 +00:00
Jon Smirl
1e7ce9f6f1 Convert miniglx to use xf86drm from dri/drm/libdrm instead of src/mesa/drivers/dri/dri_client 2004-07-05 23:51:48 +00:00
Jon Smirl
5500094413 Convert miniglx to use Ian's fancy new driver config code.
This removes the miniglx driver function InitContextModes().
All of the server directories were edited to remove the implementations.
2004-07-05 23:42:02 +00:00
Ian Romanick
10b3bf6013 Fix typos in comments. 2004-07-05 22:42:14 +00:00
Ian Romanick
6c5402bccd Another "if it ain't broke, don't fix it" moment. Revert some more
code in _glapi_set_dispatch to its 1.74 form.  This fixes a "problem"
with buggy apps that make GL calls with no bound GL context (i.e.,
Enemy Territory during shut-down).
2004-07-05 22:40:54 +00:00
Brian Paul
8a08853536 fixed AIX color interpolation bug 2004-07-05 14:54:16 +00:00
Brian Paul
cbc96b705d patch for AIX (bug 983144) 2004-07-05 14:50:12 +00:00
Brian Paul
cacf473732 added cast to fix AIX color interpolation problem (bug 983144) 2004-07-05 14:48:15 +00:00
Daniel Borca
3e94fd3444 added GL_ARB_point_sprite.
color masking correctly implemented for 15bpp.
small fixes for textures and tri engine.
2004-07-05 06:47:17 +00:00
Daniel Borca
fd003824ad fixed non-threaded codepath 2004-07-05 06:15:37 +00:00
Eric Anholt
3e77737955 Bugzilla #755: Fix polygon offset by setting DEPTH_SCALE to depth_scale instead
of 1.0.
2004-07-04 20:49:04 +00:00
Jon Smirl
aaebfc88c0 Patch removes _SOLO definition needed for mesa-solo. mesa-solo
uses the NEW_INTERFACE now so _SOLO isn't necessary anymore.
Tested with the hardware that I own.
2004-07-04 20:33:48 +00:00
Brian Paul
2371033bba document some assumptions made about compressed texture tile size 2004-07-02 16:39:59 +00:00
Brian Paul
1675058a34 a few comments 2004-07-02 16:36:29 +00:00
Brian Paul
bbea6ec0b6 disable some debug printfs 2004-07-02 14:35:50 +00:00
Brian Paul
d07859e718 redo the event loop to make event response better 2004-07-02 14:35:05 +00:00
Brian Paul
3bdc8535fc init some vars to silence warnings 2004-07-02 14:22:42 +00:00
Daniel Borca
009542a0f7 added GL_EXT_fog_coord.
added GL_EXT_blend_equation_separate.
minor cleanup.
2004-07-02 10:34:48 +00:00
Daniel Borca
3aa364c8e1 put back the correct dispatcher for non-threaded builds.
fixed x86 entrypoints for Mingw/DJGPP.
2004-07-02 10:32:52 +00:00
Ian Romanick
d14d103a0c Fix a potential race condition. Fix a couple of places where
_glapi_DispatchTSD wasn't properly handled.
2004-07-02 00:01:09 +00:00
Ian Romanick
2491d5135b Make sure THREADS is set no matter which threading model is selected. 2004-07-01 23:58:15 +00:00
Brian Paul
dedff2c3b2 just a test; no change 2004-07-01 20:13:26 +00:00
Brian Paul
953f2a6a2b just a test; no change 2004-07-01 20:12:44 +00:00
Brian Paul
9eaecaf21a just a test; no change 2004-07-01 17:57:00 +00:00
Brian Paul
41fc5952e5 just a test; no change 2004-07-01 17:56:29 +00:00
Brian Paul
04e29afdff just a test; no change 2004-07-01 16:06:32 +00:00
Brian Paul
76cfed853f added commands for AIX shared libs (Shane Blackett) 2004-07-01 15:33:14 +00:00
Brian Paul
6d50d91ae4 added aix-static config, make aix config build dynamic libs 2004-07-01 15:32:51 +00:00
Keith Whitwell
3d38361b71 Rename the various function types in t_context.h to include a tnl_ prefix. 2004-07-01 13:14:05 +00:00
Keith Whitwell
c3c8c71846 Remove __driRegisterExtensions 2004-07-01 13:00:19 +00:00
Keith Whitwell
f8b1825f97 Rename 'emit_func' usages in drivers. Will also rename the ones in
t_context.h.
2004-07-01 12:01:59 +00:00
Alan Hourihane
869fc59b63 fix for older gcc's (from freedesktop bug id #419) 2004-07-01 11:35:53 +00:00
Keith Whitwell
160215bdeb Add t_context.h include for drivers. 2004-07-01 05:35:12 +00:00
Keith Whitwell
009aa3ef5e Add infrastructure for t_vertex.c codegen. Add an example driver
for this which spits out C code for the generated functions.
2004-06-30 11:48:21 +00:00
Ian Romanick
8e77da1cd7 First phase of TLS work. At this point SPARC assembly dispatch is
broken, but it will be fixed "shortly."  This is pretty much the same
as the patch I sent to the dri-devel list on 22-Jun-2004.
2004-06-29 19:08:20 +00:00
Jon Smirl
c61c7cb8e4 This should make most linux-solo drivers work again. Mainly a fix
for changing SAREA size form DRM_PAGE_SIZE to SAREA_MAX. fb driver
is still broken.
2004-06-29 04:50:29 +00:00
Brian Paul
7c1207a2ec fixed vertex program state references 2004-06-29 00:30:06 +00:00
Brian Paul
fc84e82b28 fix another bug in get_register_pointer() 2004-06-29 00:21:04 +00:00
Brian Paul
80cc018a68 the get_register_pointer() function was pretty well broken in a few ways 2004-06-29 00:03:59 +00:00
Brian Paul
ac33dd1312 disable some debug code 2004-06-29 00:00:29 +00:00
Brian Paul
824fdf035e remove trailing whitespace and misc clean-ups 2004-06-29 00:00:06 +00:00
Roland Scheidegger
26755698c8 add missing R200_RB3D_BLENDCOLOR to r200/radeon_sanity.c 2004-06-28 22:32:38 +00:00
Brian Paul
dbe1ecaa1d option to test with display lists 2004-06-28 22:03:44 +00:00
Brian Paul
36bdb07860 glBegin/EndQueryARB bug fix 2004-06-28 22:02:23 +00:00
Brian Paul
d322dc1469 glBegin/EndQueryARB didn't work inside display lists 2004-06-28 22:01:12 +00:00
Brian Paul
625a339a8a make sure Q has a good value before drawing a sample 2004-06-28 15:16:28 +00:00
Jon Smirl
c2bffec91a Mesa-solo builds with these changes. There are still more fixups needed to
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
2004-06-26 17:16:42 +00:00
Ian Romanick
e16f6e3f23 Re-enable SPARC assembly on sunos5-gcc platform. 2004-06-26 00:02:51 +00:00
Ian Romanick
9eecb03226 Make sure mklib sees the definition of CC and CXX. Make mklib respect
the definitions of CC and CXX on Linux.  This fixed build issues with
sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set
to a GCC 3.x compiler.
2004-06-25 22:51:39 +00:00
Erdi Chen
74b380b2ec Corrected a float to ubyte conversion bug with fog enabled. 2004-06-25 20:31:40 +00:00
Brian Paul
c9a415663a remove program from hash table when deleted (bug 979514) 2004-06-25 14:46:48 +00:00
Roland Scheidegger
a09db0a7fa new test which uses mixed texgen/non-texgen texture coordinates to exhibit potential bugs in hardware drivers 2004-06-25 13:49:46 +00:00
Brian Paul
9a47d2b7cf fix GL_HP_occlusion_test bug, use glext.h version 23 2004-06-24 16:39:53 +00:00
Brian Paul
939dd17653 fix HP occlusion testing when using generic span path 2004-06-24 16:35:18 +00:00
Brian Paul
de67b3ea18 fix capitalization, new comments, etc 2004-06-24 16:32:27 +00:00
Brian Paul
6cf3f579ef added library dependencies (bug #978758) 2004-06-24 15:35:42 +00:00
Daniel Borca
adf6d0d9f7 hack for compressed textures with aspectratio greater than 8:1 2004-06-24 06:48:05 +00:00
Daniel Borca
701987c877 disabled unnecessary assertions in texture replicator 2004-06-24 06:44:38 +00:00
Daniel Borca
b3eda2443a added back x86 entrypoints 2004-06-24 06:42:21 +00:00
Brian Paul
0349b4b2ab Fixed occlusion_zless_triangle() to work with 16 or 32-bit Z buffers.
Removed some unneeded lines, other minor clean-ups.
2004-06-23 22:47:46 +00:00
Roland Scheidegger
d7ea75061c revert accidental change from rev. 1.10 2004-06-23 17:37:16 +00:00
Brian Paul
e4fbcd0fca updated to version 23 2004-06-23 14:48:04 +00:00
Ian Romanick
ea93e6d378 Don't include glapi_*.S files in DRI / solo builds. 2004-06-22 21:32:59 +00:00
Brian Paul
6b869d4fe1 Alexander Gottwald's patch for cygwin 2004-06-22 17:16:02 +00:00
Brian Paul
a64feeffca check for NULL pointer to glTexImage (fix verified by Adam Jackson) 2004-06-22 17:06:30 +00:00
Daniel Borca
3ea9cf0d5c added support for non-64bit compilers 2004-06-21 10:41:01 +00:00
Brian Paul
0590786f8a call ctx->Driver.NewProgram() instead of CALLOC/etc in _mesa_LoadProgramNV. Fixes problems found with Cg demos. 2004-06-20 20:57:22 +00:00
Brian Paul
26359143b6 remove redundant program field initializers in BindProgram(); ctx->Driver.NewProgram() does the inits 2004-06-20 20:55:36 +00:00
Brian Paul
636d4db608 latest bug fixes, etc. 2004-06-20 19:17:39 +00:00
Brian Paul
7576b9b19d store's to RC/HC didn't work (bug 976287) 2004-06-20 19:16:55 +00:00
Brian Paul
f252f64430 Big-endian texture fixes from Michel Dänzer. 2004-06-19 17:44:23 +00:00
Brian Paul
07694b8935 Remove ADD_POINTERS code from import() function - it broke UT2004.
Code clean-ups, reformatting, const-correctness, etc.
2004-06-19 15:38:31 +00:00
Daniel Borca
f0f23aaba8 Hack for linear fogging. Added empty routines for WGL_ARB_pixel_format WGL_ARB_render_texture WGL_ARB_pbuffer 2004-06-19 11:07:58 +00:00
Keith Whitwell
1e93e197f9 Use correct macros for packing pixel colors -- this bug is probably
present in many of the other drivers as well.
2004-06-18 10:58:30 +00:00
Keith Whitwell
594c3f67ac add missing license texts 2004-06-18 10:54:48 +00:00
Roland Scheidegger
8ad28091ae use I8 internal format for GL_INTENSITY, GL_ALPHA and GL_LUMINANCE texture formats. Fix various small bugs with tex env combine mode GL_DOT3_RGB(A)/GL_DOT3_RGB(A)_EXT 2004-06-17 21:19:21 +00:00
Roland Scheidegger
e3f926ad51 use I8 internal format for GL_INTENSITY, GL_ALPHA and GL_LUMINANCE texture formats. Fix potential bug with tex env combine mode GL_DOT3_RGB/GL_DOT3_RGB_EXT and ALPHA_SCALE 2004-06-17 21:08:02 +00:00
Roland Scheidegger
6c1833e372 fix tex env mode GL_BLEND for GL_INTENSITY texture formats 2004-06-17 20:54:46 +00:00
Ian Romanick
fb75ca1b65 Make the test check for core GL version 1.3 in addition to testing for
GL_ARB_texture_compression.  Also make the test list the compression formats
the driver "encourages" the app to use.
2004-06-17 20:53:07 +00:00
Dave Airlie
919498e41c Fix up texture compression mipmapping .. not sure if it fixes FXT1 but
with S3TC patch it fixes those
2004-06-17 13:42:45 +00:00
Brian Paul
85ffbdd8d7 fix component indexing bug in _mesa_texstore_al88() 2004-06-16 16:49:59 +00:00
Brian Paul
ed60bc6fdc don't use // comments (Thomas Hellstrom) 2004-06-16 15:33:33 +00:00
Dave Airlie
972ff46a0b remove unused mode function 2004-06-16 12:38:47 +00:00
Dave Airlie
1a544b0500 switch to using driFillInModes fix depthbuffer = 0 2004-06-16 12:31:23 +00:00
Keith Whitwell
6d43ce5402 Fix batch.ptr when dropping a batchbuffer segment due to zero cliprects. 2004-06-16 12:03:53 +00:00
Ian Romanick
fff749e893 Fix a couple typeos in the tables for driFillInModes. 2004-06-15 16:22:45 +00:00
Roland Scheidegger
997e81fe75 added more compressed formats to is_color_format() 2004-06-15 14:11:09 +00:00
Daniel Borca
09c9bfb22d fix correct parameters passed to StoreImage 2004-06-15 09:06:53 +00:00
Adam Jackson
f449e370db _really_ fix parameters to StoreImage calls. 2004-06-14 23:38:00 +00:00
Brian Paul
3405708e21 added compressed formats to is_color_format() and updated some comments 2004-06-14 21:01:08 +00:00
Daniel Borca
3dc3cc9d40 Fixed a bug in vertex emitter (untile we move to t_vertex.c) 2004-06-14 09:11:13 +00:00
Dave Airlie
2a28636274 add i915 as it seems to build okay.. 2004-06-12 02:36:42 +00:00
Brian Paul
7aa0e6125d just a comment 2004-06-11 22:47:47 +00:00
Brian Paul
5b05a187dc disable GL_INTENTSITY in _mesa_is_legal_format_and_type(). See table 3.6 of the 1.5 spec 2004-06-11 22:47:22 +00:00
Brian Paul
916e749241 s/_mesa_get_current_context()/GET_CURRENT_CONTEXT()/ 2004-06-11 22:44:55 +00:00
Brian Paul
8b33258d07 remove the 3dfx CatchSignals stuff (the var was alwasy set) 2004-06-11 22:44:22 +00:00
Brian Paul
beef59e73a added GL_BGR and GL_BGRA to is_color_format() (Ronny Vindenes 2004-06-11 19:08:55 +00:00
Brian Paul
3f3d11d067 fix some minor glitches in glGetTexParameter code 2004-06-11 17:18:26 +00:00
Alan Hourihane
7cbc966324 re-enable rect texture 2004-06-11 15:36:42 +00:00
Brian Paul
4102a3045c fix minor typo in comment 2004-06-11 15:23:04 +00:00
Brian Paul
22dad683b1 don't pass GL_INTENSITY for <format> to glTexImage2D - it's illegal 2004-06-11 15:07:23 +00:00
Brian Paul
694b10ca6d document recent changes/fixes 2004-06-10 20:48:46 +00:00
Brian Paul
601df9c742 Additional error checking for glTexImageXD.
Only allow 1D and 2D GL_DEPTH_COMPONENT textures.
Make sure internal format and user format are in same catagory.
2004-06-10 20:46:23 +00:00
Brian Paul
13ad04719e Roland's patch to fix promotion of alpha or luminance textures to the
luminance_alpha format.  In particular, using the al88 format to store
GL_ALPHA textures with r200 driver.
2004-06-10 17:26:05 +00:00
Keith Whitwell
41b58954e1 New driver for i915 as well as older i830/i845/i865 chipsets. 2004-06-10 12:48:07 +00:00
Dave Airlie
d7f76c7c88 try and find the drm in a more likely place 2004-06-10 10:01:14 +00:00
Dave Airlie
d4dcc6b5c0 Add FXT1 compression support to i830 driver 2004-06-10 09:54:45 +00:00
Eric Anholt
932e6fb420 Fix an "overflow in implicit constant conversion" warning in mEndPrimitive when
more warning flags are enabled (such as in the DRI tree).  Make the second line
prettier, too.

Reported by:	ajax
2004-06-10 09:13:31 +00:00
Adam Jackson
8a41ead407 silence a warning 2004-06-10 08:52:37 +00:00
Dave Airlie
b3a4a07c61 remove unused stuff, fix non-native build 2004-06-09 05:10:29 +00:00
Dave Airlie
15be94fc26 fix mach64 non native.. no reason to use it... 2004-06-09 05:04:46 +00:00
Eric Anholt
59b0db3008 Fix reflect demo: We were using the 3D Clear path unnecessarily, which appears
to be broken in the stencil case for unknown reasons.
2004-06-09 04:59:30 +00:00
Eric Anholt
695a69029f * sisChooseRenderState doesn't depend on _NEW_TEXTURE at all.
* Clean up definition of _SIS_NEW_RENDER_STATE.
2004-06-09 04:58:03 +00:00
Dave Airlie
e5a916d5b9 make rm for common not complain 2004-06-09 02:44:14 +00:00
Dave Airlie
9e9feacb43 remove depend on clean 2004-06-09 02:43:26 +00:00
Dave Airlie
37a94995cf fix bug with emitting spec/fog report by Eric Anholt, this isn't the prettiest
fix but it does work
2004-06-09 02:29:22 +00:00
Brian Paul
0590895ea7 fix parse error in sign of exponents (bug 968323) 2004-06-08 15:20:23 +00:00
Dave Airlie
7c381a267a Fix rectangular textures on i830 - well texrect at least 2004-06-08 10:21:59 +00:00
Eric Anholt
e84f77be21 * Convert to use t_vertex.c instead of sis_vb.[ch]
* Don't dispatch vertices directly to MMIO; queue them up in dma-like buffers
  first.  This makes things more uniform between AGP and MMIO paths, cleans up
  some locking ugliness, and makes the driver look more like other drivers.
* Don't use the AGP Cmd buffer provided by the server.  Instead allocate one in
  the client, which avoids the need for lots of synchronization stuff.
* Mark some MMIO accesses volatile that should have been.
* Disable the AGP submission path by default (agp_disable=true) due to
  unresolved issues in the new code.  The old code had its own (serious) errors
  with AGP, so this is not really a step backwards.
2004-06-08 09:19:17 +00:00
Daniel Borca
a94185474d corrected a bug wrt point_size 2004-06-08 06:08:56 +00:00
Eric Anholt
06668ed20a Clean a little whitespace that's been bothering me. 2004-06-08 04:38:33 +00:00
Ian Romanick
7c46033130 Fix up some remaining include issues. Replace Xmalloc / Xfree with
_mesa_malloc / _mesa_free.  Replace Bool with GLboolean.
2004-06-07 21:23:12 +00:00
Ian Romanick
03d7596b84 The required DDX and DRI version numbers were switched. This went unnoticed
on several drivers (i.e., R200, Radeon, R128, Unichrome) becuase the
required DRI and DDX versions were 4.0.0.  Mach64 was already fixed.
2004-06-07 20:18:43 +00:00
Eric Anholt
635ba1565c Add NEW_INTERFACE bits. 2004-06-07 19:13:18 +00:00
Dave Airlie
1312498709 fix all those warnings 2004-06-07 13:26:05 +00:00
Dave Airlie
f9b107d876 use the mesa defines 2004-06-07 12:51:05 +00:00
Dave Airlie
6fc70e87ed oops fix a bug I introduced 2004-06-07 12:35:38 +00:00
Dave Airlie
cbf863ee71 fix the versions 2004-06-07 11:58:59 +00:00
Daniel Borca
2c161cf395 small corrections 2004-06-07 06:03:08 +00:00
Dave Airlie
edea87529e make endian code work on BSD 2004-06-07 00:29:40 +00:00
Dave Airlie
4ffbb81bd3 Remove use of X windows include 2004-06-06 23:32:12 +00:00
Ian Romanick
e1a7f31c2b Remove the rest of the need for glxclient.h and remove it from the tree. 2004-06-06 02:20:20 +00:00
Ian Romanick
75046c5e59 Remove drivers that have not been converted to the new interface from
the DRI builds.
2004-06-06 02:19:24 +00:00
Ian Romanick
a704e44f0a Bool may not be available when DRI_NEW_INTERFACE_ONLY is defined. 2004-06-06 01:36:30 +00:00
Ian Romanick
45e7b47d56 Enable use of new DRI interface in Unichrome driver. 2004-06-05 00:48:48 +00:00
Ian Romanick
e3a07ba609 Start to "modernize" the driver. 2004-06-04 22:43:52 +00:00
Ian Romanick
e3789ebe7d Replace 'Display *' with '__DRInativeDisplay *'. 2004-06-04 17:31:46 +00:00
Ian Romanick
98e7d810e1 Enable GL_EXT_blend_subtract and GL_NV_blend_square.
GL_EXT_blend_subtract was already enabled via GL_ARB_imaging, but now
one of the added modes is supported in hardware.  GL_NV_blend_square
was tested with progs/tests/blendsquare on an Rage128 Pro with PCI ID
1002:5046.  I know there are some differences with some versions of
the chip.
2004-06-04 00:46:23 +00:00
Jon Smirl
d672f38709 Redo of removing __driRegisterExtensions(). I accidentally undid the previous check in. 2004-06-03 23:30:33 +00:00
Ian Romanick
82a5581089 Enable use of new DRI interface in Rage128 driver. 2004-06-03 23:16:58 +00:00
Roland Scheidegger
4d8c0398f1 fix minor signedness issue in assertion 2004-06-03 20:53:27 +00:00
Ian Romanick
da1766f12f Remove fill_in_modes and use driFillInModes instead. 2004-06-03 19:08:36 +00:00
Ian Romanick
7439605697 Add a new function, driFillInModes, that is to be used by drivers to
create the set of support __GLcontextModes.  This should replace the
current driver-specific fill_in_modes functions.
2004-06-03 18:57:18 +00:00
Keith Whitwell
173bc32195 Fix problems when sizeof(Node) != sizeof(float) 2004-06-03 13:52:10 +00:00
Daniel Borca
93c91c3863 masked out unsupported glBlendColor (some games check only the proc addr) 2004-06-03 07:14:27 +00:00
Jon Smirl
8f980b0e74 Open/Close FullScreen die. unichrome and savage implemented, code is ifdef'd out 2004-06-03 02:34:31 +00:00
Jon Smirl
ba3d643c49 kill __driRegisterExtensions(), none of the functions did anything 2004-06-03 01:56:07 +00:00
Ian Romanick
5b98ada880 driCheckDriDdxDrmVersion uses a function that is not available to
drivers when DRI_NEW_INTERFACE_ONLY is defined.  #ifndef it away in
that situation.

Add a new function, driCheckDriDdxDrmVersion2, that is passed in the
version information that is already supplied to __driCreateNewScreen.
Part of the reason that information is supplied to
__driCreateNewScreen is so that the driver doesn't have to make those
calls to get it!

Modify all drivers that support the new interface to use the new
function instead of the old.  As soon as all drivers support the new
interface, driCheckDriDdxDrmVersion can be removed.
2004-06-02 22:48:03 +00:00
Jon Smirl
ffb36d57a5 Removed need for sarea.h, various touch ups to get rid of type mismatches. 2004-06-02 22:45:00 +00:00
Ian Romanick
1960182ece Require libGL API version 20040602, which actually exports
__glXGetDrawableInfo.  Make sure driCreateNewDrawable sets
pdraw->private to NULL for all failure paths.
2004-06-02 22:24:00 +00:00
Ian Romanick
5c113461df Make sure USE_NEW_INTERFACE is defined if DRI_NEW_INTERFACE_ONLY is
defined.
2004-06-02 22:12:24 +00:00
Roland Scheidegger
48ccaf2009 add support for more than 2 texture units (max 6, default 4). use hang workarounds only for r200, not derivatives. 2004-06-02 22:09:11 +00:00
Roland Scheidegger
2665a4e74c change GL_ARB_texture_env_crossbar implementation behaviour to OGL 1.4 core specification instead of extension specification (undefined behaviour instead of disabled blending if not enabled texture units are referenced). Fix minor signedness bug. 2004-06-02 21:40:03 +00:00
Ian Romanick
749e842953 Replace Bool with GLboolean. 2004-06-02 20:46:03 +00:00
Ian Romanick
bb45fec074 Minor changes to make it work better outside X. "Success" is replaced
by explicit 0.  Several functions that are not needed with
DRI_NEW_INTERFACE_ONLY are blocked with '#ifndef DRI_NEW_INTERFACE_ONLY'.
Some further work is still required to make it build without any X
include files, though.
2004-06-02 20:45:19 +00:00
Ian Romanick
6632a751be Replace use of XID with __DRIid. 2004-06-02 20:41:16 +00:00
Ian Romanick
e3490edc59 Re-import from DRI tree. 2004-06-02 17:48:43 +00:00
Ian Romanick
18a5ecec89 DRI_NEW_INTERFACE_ONLY is now the only support way to build in the
Mesa tree.  If you need a driver that supports the old libGL/DRI
inteface, it must be built in the DRI tree.
2004-06-02 17:48:16 +00:00
Ian Romanick
318aa84099 XF86DRIDestroyContext, XF86DRICreateDrawable, and
XF86DRIDestroyDrawable are all called directly from DRI drivers using
the new interface.  Therefore, prototypes, using available datatypes,
must be available in dri_interface.h.  Since the prototypes are
available there, xf86dri.h is no longer needed for
DRI_NEW_INTERFACE_ONLY builds.
2004-06-02 17:37:09 +00:00
Brian Paul
9fcb9c3ac7 fix stencil index bug (#964704) 2004-06-02 15:51:31 +00:00
Ian Romanick
c06b25594e Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with
drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.
2004-06-02 05:07:10 +00:00
Brian Paul
d203091d20 Check for NULL texture object when choosing texture sampler. Fixes segfault when fragment program references an incomplete texture 2004-06-02 00:16:42 +00:00
Ian Romanick
a4436a8f44 Fix dumb mistake from a previous commit. __driCreateScreen is now
properly block with '#ifndef DRI_NEW_INTERFACE_ONLY'.
2004-06-01 23:14:19 +00:00
Roland Scheidegger
7a6eda7137 add support for GL_ARB_texture_env_crossbar 2004-06-01 23:04:10 +00:00
Ian Romanick
60b0e12830 Convert 'Display *' to '__DRInativeDisplay *'. Only portions of the
interface that are not *strictly* part of the old interface were
changed.  Replace GetDrawableInfo type (dri_util.h) with
PFNGLXGETDRAWABLEINFOPROC (dri_interface.h).  Wrap __driCreateScreen
(in drivers that use the new interface) with '#ifndef
DRI_NEW_INTERFACE_ONLY'.
2004-06-01 20:24:59 +00:00
Ian Romanick
ec032cb17b Fix a couple issues related to GetDrawableInfo. In the new DRI
interface, it must be available from libGL, and the the typedef in
dri_util.h was wrong.
2004-06-01 19:20:12 +00:00
Ian Romanick
0521ab46c1 Replace occurances of GLXDrawable and Drawable with __DRIid. 2004-06-01 17:06:09 +00:00
Ian Romanick
fabe2b9ba3 Replace all occurances of XF86DRIClipRect (and related typedefs) with
drm_clip_rect_t.
2004-06-01 16:38:56 +00:00
Ian Romanick
a249ad756f Fix a couple typos that prevent building with DRI_NEW_INTERFACE_ONLY. 2004-06-01 15:42:14 +00:00
Eric Anholt
0c0f5c2b72 Remove unnecessary #include "mach64_common.h" which breaks the build for me. 2004-06-01 02:00:25 +00:00
Eric Anholt
f016e2509e Missed in last commit:
Build fixing for FreeBSD.  GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".
2004-06-01 00:39:34 +00:00
Eric Anholt
2fb5d15ce3 Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".
2004-06-01 00:06:14 +00:00
Eric Anholt
c1311d80bd Use MKDEP make variables instead of hard-coding. 2004-05-31 22:34:49 +00:00
Daniel Borca
e35282cc13 reworked FXT1
minor fixes to fxMesa
2004-05-31 06:24:36 +00:00
Dave Airlie
54f4f44843 fixup mach64 for newer build/types 2004-05-31 00:58:34 +00:00
Brian Paul
11b3028e7b check for null pointer in Fake_glXCreateGLXPbufferSGIGIX() (bug 961376) 2004-05-29 14:41:52 +00:00
Adam Jackson
2ac56c66d2 use new interface for tdfx (phase 2) 2004-05-28 19:27:33 +00:00
Adam Jackson
cd630037a2 Fix type conflict. 2004-05-28 16:50:42 +00:00
Roland Scheidegger
1071162b36 update so it compiles again (untested driver path!). Basically ported changes from r200_maos_arrays.c cvs rev. 1.3-1.5. 2004-05-28 14:55:07 +00:00
Roland Scheidegger
957b734322 remove never finished verts path (r200_maos_vbtmp.h, r200_maos_verts.c) and unused R200_OLD_PACKET macro 2004-05-28 14:50:36 +00:00
Ian Romanick
8cdccc82d7 Define PFNGLXGETMSCRATEOMLPROC so that DRI will build without including
glxext.h.
2004-05-27 22:49:12 +00:00
Ian Romanick
b3981ab6e6 Move dri_util.[ch] and glcontextmodes.[ch] from dri_client to common. 2004-05-27 22:31:06 +00:00
Roland Scheidegger
aaaf38d372 change some explicit references to texture units 0/1 to unit < MaxTextureUnits (Andreas Stenglein, Ronny Vindenes) 2004-05-27 16:56:47 +00:00
Ian Romanick
d44e9e39da Build the fogcoord demo. 2004-05-27 15:21:44 +00:00
Ian Romanick
7867799c72 Modify glprocs.h to have two tables instead of one. The first table
is just a huge string will all the function names in it.  The second
table contains offsets into the first table instead of pointers to
strings.
2004-05-27 00:05:13 +00:00
Ian Romanick
c1d455f582 Convert all calls using _glapi_Dispatch to use the new GL_CALL macro. 2004-05-27 00:03:53 +00:00
Ian Romanick
77bbbb3759 Minor code simplification. 2004-05-26 17:12:56 +00:00
Ian Romanick
63b2e426ac Test the overhead of just calling a GL function. The Python script is
a helper to do multiple runs and compare the results.
2004-05-26 16:38:38 +00:00
Brian Paul
e6e0ba781b only use simple_z_textured_triangle if depthBits <= 16 2004-05-25 22:29:52 +00:00
Ian Romanick
3953e12890 Added a couple fog coordinate related register defines. 2004-05-25 21:14:47 +00:00
Ian Romanick
a1cafadb26 Modify the generate assembly code to not use global registers %g2,
%g3, %g6, or %g7.  This should eliminate the warnings about global
registers used without a ".register" directive.
2004-05-25 16:51:56 +00:00
Daniel Borca
680d390550 oops 2004-05-25 14:19:30 +00:00
Daniel Borca
6db87bc889 FXT1 texture compression (initial draft) 2004-05-25 07:22:41 +00:00
Ian Romanick
fb4449033b Fixed a bug that caused every dispatch function to call glNewList. 2004-05-24 23:05:09 +00:00
Felix Kuehling
0f8a2718a3 WAIT_IDLE_EMPTY in savageSwapBuffers until real frame throttling is possible. 2004-05-24 22:26:49 +00:00
Eric Anholt
bbd557fc53 Clean up some warnings by making sis_fatal_error a macro, and let it take an
argument of a message to print.  Make some assert(0)s use sis_fatal_error.
2004-05-24 20:48:27 +00:00
Eric Anholt
8c805fed0f Add missing sisInitDriverFuncs call. Fixes segfault. 2004-05-24 20:09:59 +00:00
Ian Romanick
958103c77c Generates assembly dispatch stubs for SPARC. Generates different output
than glsparcasm.py, but the assembled code should be the same.  The seems to
only work with GCC version >= 3.0.  The older preprocessor doesn't like the
embedded # in the GLOBL_FN macro.  On the SPARC system I used, /ccs/bin/as
didn't like the @function, it would only accept #function.
2004-05-24 17:48:21 +00:00
Dave Airlie
257e474474 stop crash when debugging 2004-05-24 10:43:43 +00:00
Roland Scheidegger
9e29536f28 use OGL 1.1 color logic ops in addition to GL_EXT_blend_logic_op 2004-05-21 17:03:38 +00:00
Brian Paul
cbde37a31c fix bug #957792 (swap buffers), plus misc clean-ups 2004-05-21 15:57:11 +00:00
Brian Paul
27eb8fa35a remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value 2004-05-21 15:51:13 +00:00
Roland Scheidegger
7225a7292a (Dieter Nuetzel) fix typo in help screen 2004-05-21 14:51:33 +00:00
Brian Paul
254d519c6a s/core/main/ 2004-05-21 14:48:58 +00:00
Roland Scheidegger
1bf9499ee1 fix constant texture environment color setup for texture units > 0 2004-05-21 14:20:26 +00:00
Ian Romanick
ad447964e0 s/sop/rop/ in a couple places to fix some bugs. Added some parameter
information to several functions.
2004-05-21 03:51:55 +00:00
Brian Paul
4a54ace195 lots of updates 2004-05-20 22:27:59 +00:00
Brian Paul
1d91a0b908 updated URL 2004-05-20 22:27:30 +00:00
Ian Romanick
0c963b3142 Added all of the missing ARB extensions. Added all the enums and
types for all core versions and ARB extensions.  Converted all tabs to
spaces.
2004-05-20 21:24:27 +00:00
Daniel Borca
a863d4bffb doc update; minor changes 2004-05-20 06:11:16 +00:00
Roland Scheidegger
033728555c Add support for GL_EXT_blend_[func|equation]_separate. Fix GL_EXT_blend_color. Remove support for GL_EXT_blend_logic_op (cannot be supported together with blend_equation_separate unless a software fallback would be added). 2004-05-20 00:31:26 +00:00
Roland Scheidegger
a671fea404 add check if drm is new enough for packet R200_EMIT_RB3D_BLENDCOLOR 2004-05-20 00:23:30 +00:00
Roland Scheidegger
b6933b6811 add missing R200_RB3D_BLENDCOLOR register 2004-05-20 00:19:48 +00:00
Ian Romanick
a9d033c460 Added some in-code documentation. Modifed glParameter to be a
subclass of glItem.
2004-05-19 23:33:08 +00:00
Ian Romanick
d54549df23 Re-ordered categories. Added extension number information. 2004-05-19 19:12:05 +00:00
Daniel Borca
fc332f008c added GL_NV_blend_square
fixed alpha blending modes for Napalm
minor fix in compressed texture aspectratio adjust
2004-05-19 08:16:44 +00:00
Ian Romanick
73f59b01ea New scripts for processing the XML version of APIspec. Mail is being
sent to mesa3d-dev with a more detailed description.
2004-05-18 18:33:40 +00:00
Daniel Borca
3e15e861b2 added some core-level extensions 2004-05-18 07:13:54 +00:00
Brian Paul
b7460bb62a fixed some bogus array enable tests (Soju Matsumoto) 2004-05-17 14:19:57 +00:00
Brian Paul
3ef972f538 Replaced 'core' with 'main'.
Other minor updates.
2004-05-16 22:07:02 +00:00
Brian Paul
de4b3bb776 minor doxygen updates 2004-05-14 23:11:53 +00:00
Brian Paul
d72834dd0b Minor fixes/optimizations to type conversions in draw_depth_pixels().
Fix off by one errors in a few assertions.
2004-05-14 14:39:59 +00:00
Roland Scheidegger
b9cbd52724 Fix GL_MIN and GL_MAX blend equations (set blend factors accordingly). Fix errors when blending is disabled (set blend equation and function to default values). 2004-05-14 13:01:08 +00:00
Brian Paul
d359f96a18 cast driHwLock assignment 2004-05-13 18:24:20 +00:00
Brian Paul
f4bc136273 silence warning in assignment to gp.value 2004-05-13 18:09:53 +00:00
Brian Paul
7d749ec9be fix parameters to StoreImage() 2004-05-13 18:07:30 +00:00
Brian Paul
defb035b6c Another pass at implementing byte-swapped texture formats.
More code re-use this time.
Most formats now tested/debugged with new packedpixels.c test.
2004-05-13 15:26:51 +00:00
Brian Paul
46bc595969 Test program to check that packed pixel formats work as expected with
glTexImage2D.  All samples should appear identical.  Press f/F to change
the internal texture format.
2004-05-12 23:05:21 +00:00
Brian Paul
db862e4d4c GL_BGR can't be used with the packed types, according to the GL spec. Enforce such. 2004-05-12 22:54:47 +00:00
Brian Paul
f35b47fa62 some component ordering bugs in extract_float_rgba() 2004-05-12 21:53:34 +00:00
Erdi Chen
ba8788fee7 Fixed code that has computed incorrect number of modes. 2004-05-12 18:37:11 +00:00
Ian Romanick
c318d50717 Added support for GL_EXT_blend_equation_separate and
GL_NV_blend_square.  Fix a bug in the way the GL_MIN and GL_MAX
blending modes were handled.
2004-05-12 16:36:30 +00:00
Ian Romanick
0e22d598e6 Fixed a bug that showed up in several multitexturing games (Quake3 and
ThinkTanks were tested) that was related to the recent 4 TMU changes.
Removed the un-needed TexBlendColorPipeNum field from the hardware
context.
2004-05-12 16:29:55 +00:00
Brian Paul
f1cfb4b7a7 fix compiler warnings (Jerome Glisse) 2004-05-12 15:29:36 +00:00
Brian Paul
2e66f7eef7 fix parameters to StoreImage calls 2004-05-12 15:05:53 +00:00
Brian Paul
71e373f186 remove last remnants of NEWTEXSTORE stuff 2004-05-12 15:02:49 +00:00
Brian Paul
5726a238d4 remove the last line of the previous patch 2004-05-12 14:51:51 +00:00
Brian Paul
86c7541f9b fix red/green/blueBits typos 2004-05-12 14:48:39 +00:00
Brian Paul
751c9d096d obsolete in favor of regular Makefiles 2004-05-12 14:04:29 +00:00
Brian Paul
8813cb56b0 yank bgr233 texformat. minor comment updates. 2004-05-12 14:00:36 +00:00
Daniel Borca
e61d60eb81 minor fixes 2004-05-12 05:36:24 +00:00
Brian Paul
a156b49800 Added big-endian texture formats.
Moved CI->RGBA palette lookup into texel fetch function.
2004-05-12 01:50:30 +00:00
Ian Romanick
939f6a724e Added a 4th square to the output. Expanded the message written to the
console.
2004-05-11 19:59:13 +00:00
Ian Romanick
5f6691f371 Added simple EXT_blend_minmax test. 2004-05-11 19:57:58 +00:00
Ian Romanick
d2f18ec6fa Added simple NV_blend_square test. 2004-05-11 17:48:33 +00:00
Ian Romanick
366a27d2b9 Fix a possible segfault caused by the SGI_make_current_read changes. 2004-05-11 16:17:49 +00:00
Brian Paul
4e0d575c64 Don't call calculate_derived_texenv() from in _mesa_TexEnv().
Minor code rearranging.
2004-05-10 22:37:20 +00:00
Brian Paul
d6693c4294 s/GLX_PIXMAP_BIT_SGIX/GLX_PBUFFER_BIT_SGIX/ 2004-05-10 22:07:57 +00:00
Keith Whitwell
352d4dbfb2 Add EXT_vertex_cull support to mesa 2004-05-10 18:16:03 +00:00
Daniel Borca
39fe9a7fe3 fixed bugs in fxddtex.c
cleaned up win32 definition files
2004-05-10 07:42:26 +00:00
Jon Smirl
1cbee9c159 Fix solo build, add missing #ifdef NEW_INTERFACE 2004-05-09 04:38:42 +00:00
Felix Kuehling
302781f6cc Added german translation to option texture_units. 2004-05-08 10:08:21 +00:00
Eric Anholt
c753f367eb Don't mix variable definitions and other statements (fixed build on old
compiler).
2004-05-08 07:48:13 +00:00
Ian Romanick
c94a96bae4 Add support for GLX_SGI_make_current_read. 2004-05-07 22:46:37 +00:00
Ian Romanick
3d769b81fa Warning clean-ups. 2004-05-07 22:43:52 +00:00
Ian Romanick
216d980d53 Uses either the GLX_SGI_make_current_read or GLX 1.3 interface,
depending on which is available.
2004-05-07 18:20:43 +00:00
Ian Romanick
ed046bf842 Enable use of new DRI interface in i830 driver. 2004-05-07 18:04:23 +00:00
Ian Romanick
d81d2aeca8 Add support for the 3rd and 4th texture units. The actual number of
available units is configurable via the texture_units option.
2004-05-07 17:30:31 +00:00
Ian Romanick
f539860f79 Added a config option to set the number of available texture units. A
German translation is still needed.
2004-05-07 17:29:48 +00:00
Daniel Borca
4a1d4a25e2 documentation update 2004-05-07 06:00:53 +00:00
Ian Romanick
54f1027362 Refactor "classic" texture environments to be implemented in terms of
ARB_texture_env_combine state.  Add support for
ARB_texture_env_crossbar.  Combiner state is only emitted for operands
that need to be emitted for the combine operation.
2004-05-07 00:33:12 +00:00
Brian Paul
4ab8b77520 fix rectangle texture clamping and border-related code 2004-05-06 20:28:26 +00:00
Brian Paul
1229100703 Added menu options to test border modes and linear/nearest filtering.
Adjust texcoords so we always have to sample the border.
Other misc changes.
2004-05-06 20:27:32 +00:00
Ian Romanick
eec8dbd512 Remove a debug printf that should not have been left in. 2004-05-05 21:32:16 +00:00
Ian Romanick
cd6ca58c3f Modified to use vertex arrays. Vertex arrays and immediate mode calls
are toggled with the 't' key.
2004-05-05 20:17:19 +00:00
Ian Romanick
95a0bd6762 Added support for the 3rd texture coordinate for cubemaps and 3D
textures.  progs/demos/cubemap and progs/demos/stex3d seem to work
correctly at all tcl_mode settings.  x86 / SSE codegen is currently
disabled.
2004-05-05 20:16:17 +00:00
Brian Paul
4045b6e5b8 don't need auto mipmaps 2004-05-05 00:28:17 +00:00
Brian Paul
9c1b13ff6a fix a few bugs when using GL_REDUCE convolution mode 2004-05-05 00:28:01 +00:00
Brian Paul
07cc9af601 documentation for TexImage code changes 2004-05-05 00:02:23 +00:00
Brian Paul
cb40ebd8a2 added -c option to exercise convolution of glTexImage2D 2004-05-04 23:57:12 +00:00
Brian Paul
2b012578ee fix a bug on the convolution path 2004-05-04 23:56:24 +00:00
Brian Paul
71f88aeb10 obsolete 2004-05-04 15:17:44 +00:00
Brian Paul
07281d37a7 remove unneeded line 2004-05-04 15:12:22 +00:00
Brian Paul
bdd15b5749 Fix minor warnings found with g++. 2004-05-04 15:11:06 +00:00
Daniel Borca
33ffbd1c58 texture compression: getting warmer 2004-05-04 06:27:06 +00:00
Dave Airlie
abe4a72cfc add r200 x86 sources 2004-05-04 00:12:22 +00:00
Dave Airlie
b05d87d6f5 use X86 sources in X86 build, use none in other 2004-05-04 00:10:24 +00:00
Dave Airlie
0a8b528bf5 switch to X86_SOURCES 2004-05-04 00:09:47 +00:00
Adam Jackson
4d6f05c971 Skeletal fallback-only DRI driver. Initial checkin, not quite working yet. 2004-05-03 23:33:21 +00:00
Dave Airlie
e25dd06b4a remove this use the one from the DRM 2004-05-03 11:31:29 +00:00
Dave Airlie
898c03a573 add linux-dri-x86 target 2004-05-03 11:30:37 +00:00
Dave Airlie
e8e5b41862 the config is included by the Makefiles that includes this file... 2004-05-03 11:29:19 +00:00
Dave Airlie
47244a8181 add asm sources 2004-05-03 11:28:35 +00:00
Dave Airlie
d388f64c0e clean up the common objects.. 2004-05-03 11:01:38 +00:00
Daniel Borca
5f0b6c9f8f unbloat namespace 2004-05-03 07:35:57 +00:00
Dave Airlie
aa9767c683 get rid of last few XF86DRIClipRect 2004-05-03 06:54:54 +00:00
Dave Airlie
f7423f4628 fix up build for solo/dri 2004-05-03 06:49:40 +00:00
Dave Airlie
79518b6f37 DRM_SOURCE_PATH is in default 2004-05-03 06:48:33 +00:00
Brian Paul
edc09004fd fix StoreImage calls, remove dead code (Adam Jackson) 2004-05-02 14:32:44 +00:00
Brian Paul
80fc5ea53e restored _mesa_rescale_teximage2d() 2004-05-02 14:30:46 +00:00
Brian Paul
883e7a5906 minor vertex/fragment program tweaks 2004-05-01 18:28:49 +00:00
Daniel Borca
c5cb215e3e FXT1: getting warmer 2004-04-30 09:48:21 +00:00
Alan Hourihane
ef5c82bd02 If we can't allocate the rowimage - bail 2004-04-30 09:44:22 +00:00
Keith Whitwell
739f50f542 Define GLX_DIRECT_RENDERING in Makefile.template 2004-04-30 09:15:58 +00:00
Keith Whitwell
69ab4fec12 AMD64 changes from Ronny V. Vindenes. 2004-04-30 08:29:04 +00:00
Ian Romanick
4d46e4b26a Remove several files that are only used in the XFree86 / Xorg libGL.so.
They are *not* linked into the *_dri.so drivers.
2004-04-29 22:16:29 +00:00
Keith Whitwell
74d563cdfb Allow *_dri.so to build in Mesa tree with the 'linux-dri' target. 2004-04-29 12:23:39 +00:00
Daniel Borca
c35dcfcf0a FXT1 preparations 2004-04-29 09:01:41 +00:00
Daniel Borca
af503f3438 updated makefiles 2004-04-28 08:39:45 +00:00
Ian Romanick
eb2281f8c4 Use the dispatch table directly instead of calling GL functions. 2004-04-27 18:38:23 +00:00
Ian Romanick
d100dfbf27 Remove include of texutil.h to get build working. 2004-04-27 18:37:13 +00:00
Brian Paul
65fdeaca6c updated other makefiles 2004-04-27 13:41:56 +00:00
Brian Paul
8f04c12e0a Removed the old teximage code.
Moved all code related to specific texture compression modes into
new texcompress_s3tc.c and texcompress_fxt1.c files (but not implemented).
2004-04-27 13:39:20 +00:00
Brian Paul
186d4d8cf4 added pointer to Vincent (OpenGL ES implementation) 2004-04-27 12:55:08 +00:00
Daniel Borca
bc04d041eb transfer routines for compressed formats (avoid SEGFAULT, also prepare for external packers) 2004-04-27 05:59:52 +00:00
Daniel Borca
5be4c27b28 accomodate newtexstore
fixed wgl interface for fxMesa
2004-04-26 14:23:33 +00:00
Alan Hourihane
18514500c4 remove DitherValues 2004-04-26 12:45:06 +00:00
Alan Hourihane
462183fe4c bring over build fixes from stable branch 2004-04-26 10:10:22 +00:00
Brian Paul
08fa6de850 s/-mv8/-mcpu=ultrasparc/ (bug 941338) 2004-04-25 15:18:36 +00:00
Brian Paul
ac0cfee885 fix HP-UX typo (bug 941576) 2004-04-25 15:13:56 +00:00
Brian Paul
41318937ef call drmUnmapBufs() in mgaDestroyScreen (Tilman Sauerbeck) 2004-04-24 14:55:02 +00:00
Brian Paul
f7b4e0d376 minor fixes for entrypoint name mangling 2004-04-23 20:33:07 +00:00
Ian Romanick
e946688eda Convert R200 driver to use the t_vertex interface. 2004-04-23 20:20:07 +00:00
Brian Paul
199972cef0 move #define for GL_DOUBLE, to put enums in right order 2004-04-23 18:00:00 +00:00
Brian Paul
f2f3350774 GL_DOUBLE doesn't follow GL_FLOAT, fix indexing (Keith Harrison) 2004-04-23 17:58:06 +00:00
Brian Paul
948dff8932 init mgaScreen->irq (Tilman Sauerbeck) 2004-04-23 17:53:28 +00:00
Brian Paul
6d460af6af Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment
program is enabled AND the currently bound program is valid.
Check _Enable instead of Enable to prevent things from blowing up
when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually
defining a program.
2004-04-23 14:16:46 +00:00
Brian Paul
384800fe12 assorted fixes 2004-04-23 14:14:04 +00:00
Keith Whitwell
180e28e6d4 Add fps output 2004-04-23 14:06:02 +00:00
Brian Paul
031e86b597 remove some errant code from previous check-in 2004-04-23 13:58:44 +00:00
Brian Paul
fe4b966293 new CYGWIN docs from Eric Lassauge 2004-04-23 13:13:30 +00:00
Brian Paul
6e167151f9 s,CHAN_BITS/8,sizeof(GLchan), 2004-04-22 23:51:15 +00:00
Roland Scheidegger
6d3dc3b8d6 fix bracket at wrong place 2004-04-22 20:04:08 +00:00
Brian Paul
580548d046 added CYGWIN support 2004-04-22 16:16:42 +00:00
Keith Whitwell
7bd5343990 Fix order of EMIT_4UB_4F declarations 2004-04-22 08:14:48 +00:00
Brian Paul
66fdc3c948 added floattex.c to test floating point textures 2004-04-22 01:10:09 +00:00
Brian Paul
5b45c11486 use FetchTexelf() in GetTexImage() to return float textures correctly 2004-04-22 01:08:36 +00:00
Brian Paul
3623733472 fix some include file glitches 2004-04-22 00:54:53 +00:00
Brian Paul
2fae1bb6df minor clean-ups 2004-04-22 00:47:28 +00:00
Brian Paul
362f1df210 obsolete 2004-04-22 00:42:38 +00:00
Brian Paul
f959f6e1dc New glTexImage code.
The gl_texture_format struct now has a StoreTexImageFunc that's called
by glTex[Sub]Image[123]D to convert the user's texture data into the
specific texture format layout.  Now it's much easier to add new texture
formats (like the 16/32-bit floating point formats).
The texutil.[ch] and texutil_tmp.h files are obsolete.
2004-04-22 00:27:31 +00:00
Brian Paul
05a6f2fd48 Fix up some assorted issues with initialization of vertex program registers.
Some need to be set per-vertex, other per-primitive.  Cleared that up.
Only need to init temp/result registers if executing an NV vertex program.
2004-04-21 18:09:14 +00:00
Brian Paul
6164ae2b5a only init temp regs to zero if executing NV fragment program 2004-04-21 17:51:21 +00:00
Brian Paul
c45b7364da check return values of _swrast_CreateContext, etc 2004-04-21 16:11:27 +00:00
Brian Paul
f693b1dc2e removed non-existant arbfpwpos.c, added UTIL_FILES target 2004-04-20 23:25:47 +00:00
Keith Whitwell
74339bf471 Add printing for recently added opcodes. 2004-04-20 13:03:36 +00:00
Alan Hourihane
485438e2be add SciTech's GLDirect driver for Windows.
This code is donated to Mesa which allows the usage of
a Direct3D layer (DX7, DX8, DX9 or complete software fallback).

No build system exists for this code yet, that will come.....
2004-04-20 11:13:11 +00:00
Keith Whitwell
319f5fd5ec Simplify last fix slightly, apply to vtx paths as well. 2004-04-20 10:28:15 +00:00
Keith Whitwell
30a8a0b8fa When upgrading copied vertices, distinguish between an attribute
entering a vertex for the first time and one which was already present
but increasing its size.  Fixes Brian's normal.c bug.
2004-04-20 10:18:33 +00:00
Brian Paul
8be72c5b5d apply texgen/texture matrix in glRasterPos 2004-04-19 23:13:36 +00:00
Brian Paul
adcb228fed linux-solo-ia64 config (Stephane Marchesin) 2004-04-19 22:23:10 +00:00
Brian Paul
1fc35a44ef glTexEnviv bug fix 2004-04-19 20:26:30 +00:00
Brian Paul
ac96356300 in TexEnv functions, check if pname == GL_TEXTURE_ENV_COLOR and fetch appropriate number of param values 2004-04-19 20:24:49 +00:00
Brian Paul
e63cb85cbc do texcoord projective division in _swrast_span_default_texcoords() 2004-04-19 15:03:16 +00:00
Brian Paul
4697419c43 bug fixes for ARB/NV fragment program texture instructions 2004-04-18 20:23:24 +00:00
Brian Paul
8e048e72c1 check for __ia64__ when setting USE_IEEE 2004-04-18 20:21:16 +00:00
Brian Paul
f4b909bed0 updated instructions for new directory tree and makefile system 2004-04-18 20:17:14 +00:00
Brian Paul
eca88f8019 added missing SHADER_SOURCES to ALL_SOURCES 2004-04-18 20:14:11 +00:00
Brian Paul
51060afb4e hack to use glTexCoord4f and Q variable to test projective texcoords 2004-04-18 20:13:21 +00:00
Brian Paul
d8b82147c3 Audit/fixes for NV/ARB TEX, TXP, TXB, TXD instructions.
Some texture instructions were using wrong LOD.
Fixed interpolate_texcoords() so it doesn't do texcoord projective division
when using a fragment program.  The TXP instruction does that.
2004-04-18 20:11:52 +00:00
Keith Whitwell
c83d09e3b0 Make sure ctx->Driver.NeedFlush is set for Eval-generated attributes. 2004-04-16 08:30:12 +00:00
Keith Whitwell
aa90495915 Make _SAT instructions compile correctly. 2004-04-15 11:20:48 +00:00
Dave Airlie
4d914b80e1 make sure matypes is built 2004-04-15 05:55:26 +00:00
Dave Airlie
5772d998f4 add drm source dir for solo includes 2004-04-15 04:50:20 +00:00
Dave Airlie
85dc9fe543 get the libraries the right way round.. 2004-04-15 01:35:25 +00:00
Ian Romanick
ab37fddbfd Correct the comments about when the bindContext3 / unbindContext3
interface was added.
2004-04-15 01:24:57 +00:00
Dave Airlie
a7abda5820 set default page flipping to zero can be changed in header file 2004-04-15 01:15:38 +00:00
Brian Paul
643020dd82 wrap file in #ifdef USE_TCC, otherwise compilation failes 2004-04-14 23:23:19 +00:00
Brian Paul
06535d239b set CONFIG_NAME = linux-tcc 2004-04-14 21:35:47 +00:00
Keith Whitwell
9a543e5645 new file 2004-04-14 21:20:00 +00:00
Keith Whitwell
6fb235661a Use tcc and the emitted C code from s_fragprog_to_c.c to dynamically compile
and execute fragment programs.  Very limited and experimental, but works
well enough to run arbfplight.c.

	http://fabrice.bellard.free.fr/tcc/

Compile with 'make linux-tcc', being sure to make clean first.
2004-04-14 21:19:34 +00:00
Keith Whitwell
e3b0dde49c Fail if any subdir fails. 2004-04-14 14:41:18 +00:00
Keith Whitwell
f2b3d0828e Hack to get things compiling - include "drm.h" instead of "xf86drm.h".
Need to fix this, or get maybe rid of xf86drm.h which seems redundant
in a standalone build.
2004-04-14 13:32:37 +00:00
Keith Whitwell
6b3780cd83 Link against GL_LIB_DEPS 2004-04-14 13:31:09 +00:00
Keith Whitwell
01e6ff312e Remove mesa.a when making clean 2004-04-14 12:54:31 +00:00
Keith Whitwell
e61df58729 First attempt at building a dri module in this tree
-- make target is linux-dri
	-- will attempt to build i830_dri.so

The object builds but hasn't been tested.
2004-04-14 12:44:07 +00:00
Keith Whitwell
680ec7f851 First pass at support for building DRI drivers in mesa tree. 2004-04-14 12:39:58 +00:00
Keith Whitwell
00e01091ce Don't try to use .c=.o rule on .S files when building mesa.a 2004-04-14 10:26:47 +00:00
Alan Hourihane
3a590805d1 disable under _SOLO build 2004-04-14 08:25:57 +00:00
Daniel Borca
edf4f53c15 documentation updates
Glide3 driver: POINTCAST palette fixes
2004-04-14 08:00:52 +00:00
Dave Airlie
377ced2bf1 Add agpmode to the example config file 2004-04-14 02:14:15 +00:00
Dave Airlie
f833df0781 get agpmode from config file 2004-04-14 02:09:52 +00:00
Dave Airlie
50a8b7b611 Add shader sources for solo build 2004-04-14 02:08:37 +00:00
Dave Airlie
ec5f71d0f3 make solo work like before new makefile merge 2004-04-14 01:40:18 +00:00
Dave Airlie
5d8f7b1197 add agpmode to miniglx config file 2004-04-14 01:33:27 +00:00
Brian Paul
c50d77a7f1 minor tweak for Darwin 2004-04-13 17:35:17 +00:00
Brian Paul
e4e323f388 check for __AMD64__ when setting USE_IEEE (Ronnny Vindenes) 2004-04-13 14:11:20 +00:00
Keith Whitwell
563dadd674 Build a single string containing the generated 'C' code. 2004-04-13 13:43:48 +00:00
Alan Hourihane
bfaca5c649 fix the usage of GLX_MESA_allocate_memory 2004-04-13 09:43:51 +00:00
Daniel Borca
fb7766853d updated Glide driver documentation
fixed SAL/SAR in assyntax.h (NASM)
fixed a bug wrt NULL pointer assignment in t_vtx_api.c
cosmetics to t_vtx_x86.c & t_vtx_x86_gcc.S
enabled STDCALL with codegen (MinGW)
2004-04-13 07:08:34 +00:00
Dave Airlie
4ba589bbf0 make this exactly like XFree86 .. allows 4x to work 2004-04-13 04:58:10 +00:00
Jon Smirl
c0b0b48e5b Add DRM_SOURCE_PATH to make system.
Needed for linux-solo to build
2004-04-13 04:11:32 +00:00
Ian Romanick
231603893d Missed one with the last commit. 2004-04-12 22:41:47 +00:00
Ian Romanick
ee22ed2fb4 Conditionally compile code for x86 specific TNL codegen. This fixes problem
with x86-64 and PowerPC.

Reported by: sublett on #dri-devel.
2004-04-12 22:40:54 +00:00
Alan Hourihane
7873f85684 build fix for VMS 2004-04-11 22:22:23 +00:00
Brian Paul
2db8fe2906 fix minor glitch with GL_DEPTH_COMPONENT textures 2004-04-10 19:50:33 +00:00
Brian Paul
089645799c fix max buffer size test (Kyle Bateman, bug 912828) 2004-04-09 18:11:45 +00:00
Brian Paul
5eb921382f added extern "C" for C++ (bug 930933) 2004-04-09 17:18:22 +00:00
Brian Paul
fb31a01f87 added SPECULAR flag for sprite point functions 2004-04-09 14:13:58 +00:00
Alan Hourihane
d0c8352853 make note about needing to fix the drm driver to enable SAVAGE_CMD_DMA 2004-04-08 23:16:17 +00:00
Brian Paul
32aee1fcc0 added zreaddraw.c 2004-04-08 22:45:02 +00:00
Brian Paul
f3b732f5e5 use MKDEP var 2004-04-08 22:40:57 +00:00
Brian Paul
dd74e36763 added -noprefix option for making DRI drivers 2004-04-08 22:26:22 +00:00
Brian Paul
a3df5990d7 minor fix 2004-04-08 22:25:53 +00:00
Brian Paul
18e9b2e5f8 lots of Makefile updates for new build system 2004-04-08 22:25:29 +00:00
Brian Paul
01eab7c834 move pSAREAPriv declaration to be C-compliant 2004-04-08 22:25:03 +00:00
Brian Paul
62d3309dc2 no depend file 2004-04-08 21:11:12 +00:00
Brian Paul
78c3edc174 don't include GL/gl.h, rely on glheader.h 2004-04-08 21:10:31 +00:00
Brian Paul
bb16df1767 move 'id' declaration so it's C compliant 2004-04-08 21:10:07 +00:00
Alan Hourihane
b303217c14 build fixes 2004-04-08 08:54:23 +00:00
Alan Hourihane
caa5f7e75e remove non-portable whitespace 2004-04-08 08:10:37 +00:00
Brian Paul
9f4ccd8aa0 use new MKDEP, MKDEP_OPTIONS variables 2004-04-07 23:15:26 +00:00
Brian Paul
216aedbbc6 use # comments instead of //, etc (ajax@nwnk.net) 2004-04-07 22:46:40 +00:00
Daniel Borca
cdd6ba3096 removed wfx makefiles 2004-04-07 11:39:33 +00:00
Daniel Borca
d3746ca27e revived linux-glide build process
some small Makefile changes for MinGW & DJGPP
2004-04-07 06:37:50 +00:00
Jouk Jansen
40322e1dfa Committing in .
Correction on last commit (My FTP-server on linux is playing games with
<CR>'s)

 Modified Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/shader/arbprogparse.c
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-04-05 08:50:36 +00:00
Daniel Borca
8cc059ea64 protected all codegen behind AllowCodegen 2004-04-05 06:49:36 +00:00
Jouk Jansen
8ef874f1a5 Committing in .
Updated OpenVMS compile support due to shader directory.
 Removed <CR>'s in arbprogparse.c

 Modified Files:
 	Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/shader/arbprogparse.c
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-04-05 06:12:01 +00:00
Brian Paul
fbb60ede3d update revision history 2004-04-03 16:17:46 +00:00
Brian Paul
29f0190be7 minor corrections 2004-04-03 16:16:16 +00:00
Brian Paul
c2b989f351 minor tweak 2004-04-03 15:28:57 +00:00
Brian Paul
51aa7a93ad for make clean, include tests directory 2004-04-03 15:18:13 +00:00
Brian Paul
3c5d58ccaf shouldn't be in CVS 2004-04-03 15:17:43 +00:00
Brian Paul
347f1d966e reorder 6.0 / 6.0.1 entries 2004-04-02 23:41:18 +00:00
Brian Paul
2501fa1197 merge from 6.0 branch 2004-04-02 23:37:02 +00:00
Brian Paul
8b7da14b82 added some assertions, just to be safe 2004-04-02 22:07:53 +00:00
Brian Paul
ec38d1c22c fix bad array indexing in _save_current_init() that caused context state to get clobbered 2004-04-02 22:07:23 +00:00
Brian Paul
ff1a015ca8 Implement ARB_f_p KIL correctly. 2004-04-02 17:27:46 +00:00
Brian Paul
17355e8b38 add braces to silence warnings 2004-04-02 17:17:00 +00:00
Brian Paul
7feb528905 added FLUSH_CURRENT() call in GetMaterial() calls 2004-04-02 17:01:01 +00:00
Daniel Borca
f17980cdb7 got rid of the notify routine as intermediate step 2004-04-02 09:34:39 +00:00
Daniel Borca
94922b9d2d disabled naughty cheats and protected the choosers behind AllowCodeGen 2004-04-02 09:12:42 +00:00
Daniel Borca
77865f81c9 added codegen'ed choosers 2004-04-02 06:42:04 +00:00
Brian Paul
8b0afe0a67 fix error in rgb332 texel fetch function 2004-04-02 05:10:17 +00:00
Keith Whitwell
96f17ea938 Rename _x86_ symbols to avoid conflict with r200 driver 2004-04-01 17:34:09 +00:00
Keith Whitwell
f41579cd9e Remove test for USE_X86_ASM & HAVE_NONSTANDARD_GLAPIENTRY 2004-04-01 17:32:14 +00:00
Felix Kuehling
d1c1056309 Define empty _tnl_x86_exec_vtxfmt_init if USE_X86_ASM is undefined. This
fixes a missing symbol in libGLcore.a.
2004-04-01 11:10:18 +00:00
Daniel Borca
e5c7f44009 codegen'ed versions of the 2nd level dispatch 2004-04-01 06:53:22 +00:00
Daniel Borca
13822537a7 fine-tuning x86 gcc codegen 2004-03-31 08:31:41 +00:00
Keith Whitwell
b48c575983 dynfn --> _tnl_dynfn 2004-03-31 06:36:30 +00:00
Brian Paul
3e280b3fe7 these are now in the shader/ directory too 2004-03-30 23:05:56 +00:00
Brian Paul
27eb79c9dc these files now live in the shader directory 2004-03-30 22:52:00 +00:00
Keith Whitwell
bcc6a02afc Why are there two copies of this file? 2004-03-30 21:55:14 +00:00
Keith Whitwell
4135601459 Make the output a little more likely to compile... 2004-03-30 16:34:45 +00:00
Brian Paul
a7f52a9ba1 Reorder some code so we don't upset program state when there's a parsing error.
Be sure to assign program.Base.String pointer.
2004-03-30 15:55:10 +00:00
Brian Paul
41d389909b Insert original fragment program instructions as comments.
s/__inline/INLINE/
2004-03-30 15:53:58 +00:00
Brian Paul
ff7d3bb7df added hpux10-static config 2004-03-30 14:56:47 +00:00
Brian Paul
52fb07e2b2 merge from 6.0.1 branch 2004-03-30 14:47:02 +00:00
Keith Whitwell
257c085db9 Amusing utility to print ARB_fp programs as C code 2004-03-30 11:12:37 +00:00
Ian Romanick
d1c38f7472 Add #ifdef protection around the file to prevent DRI build breakage. 2004-03-30 00:23:25 +00:00
Brian Paul
388c455960 fix array indexing for UP4B and UP4UB 2004-03-29 16:34:01 +00:00
Keith Whitwell
eeb5eeb2a6 Accomodate ARB_fp XPD opcode separately from NV_fp's X2D. 2004-03-29 16:01:18 +00:00
Brian Paul
292fa335d6 Take a stab at updating the VMS files. 2004-03-29 14:58:42 +00:00
Brian Paul
788461fc81 fix the build 2004-03-29 14:53:49 +00:00
Keith Whitwell
076c1c2000 new files 2004-03-29 14:01:56 +00:00
Michal Krol
2861e737e8 Moved from src/mesa/main 2004-03-29 11:09:34 +00:00
Keith Whitwell
c8100a02d2 First round of codegen for t_vtx_api.c -- ie the Begin/Vertex/End code.
Enable with env var:  MESA_CODEGEN=t.
2004-03-29 11:05:02 +00:00
Michal Krol
638ea113b9 This wont be needed any more 2004-03-29 11:01:57 +00:00
Michal Krol
cfccb7e0ca Moved to src/mesa/shader and renamed to arbprogram_syn.h 2004-03-29 10:58:58 +00:00
Michal Krol
31df7c92a2 Moved to src/mesa/shader and renamed to arbprogparse.[ch] 2004-03-29 10:57:16 +00:00
Michal Krol
9661d911ee Moved to src/mesa/shader 2004-03-29 10:54:32 +00:00
Daniel Borca
71c7c1feb6 code cleanup heheh 2004-03-29 06:51:41 +00:00
Felix Kuehling
238693544c Forgot to set SAVAGE_NEW_CULL in savageDDEnable_s3d. 2004-03-27 01:04:09 +00:00
Brian Paul
5c2040c768 minor fixes 2004-03-26 23:58:08 +00:00
Brian Paul
1c8e825c2a added GLW_SOURCES for IRIX 2004-03-26 23:57:32 +00:00
Brian Paul
79b372b92a fix some warnings 2004-03-26 23:54:53 +00:00
Brian Paul
7b776de12c tweaks to APP_LIB_DEPS (Dan Schikore) 2004-03-26 23:52:47 +00:00
Felix Kuehling
58fa2a8c50 Enable drawing directly to the (now tiled) front buffer. 2004-03-26 23:27:24 +00:00
Brian Paul
1e50e4046f added .SUFFIXES : .cc line 2004-03-26 22:50:04 +00:00
Brian Paul
533befc8f9 don't try to make GLwMDrawA.c by default since it needs Motif 2004-03-26 21:48:09 +00:00
Brian Paul
df8bc57258 Don't use pushd/popd. 2004-03-26 21:38:45 +00:00
Brian Paul
d6de4d8b33 new Makefile 2004-03-26 20:37:19 +00:00
Brian Paul
46727c7496 Tweaks for make clean / realclean. 2004-03-26 20:31:05 +00:00
Brian Paul
7a5eb9a760 increase MAX_TEXTURE_LOD_BIAS to 11.0 2004-03-26 18:06:23 +00:00
Brian Paul
f132413965 clamp BiasMin, BiasMax to reasonable values 2004-03-26 18:05:36 +00:00
Brian Paul
04800374ee obsolete 2004-03-26 15:48:21 +00:00
Brian Paul
f4044955ca added glw to SRC_DIRS 2004-03-26 15:46:53 +00:00
Brian Paul
57dcbb5d4b added _DEPS lines to specify -L/usr/X11R6/lib 2004-03-26 15:37:26 +00:00
Brian Paul
1f54fc9b82 added OSMESA_DRIVER_OBJECTS and COMMON_DRIVER_OBJECTS 2004-03-26 15:36:33 +00:00
Brian Paul
22388c1902 omit CVS from configs list 2004-03-26 15:31:44 +00:00
Brian Paul
26f334a679 updated Makefile info 2004-03-26 15:20:08 +00:00
Brian Paul
d8944fb6cf Mesa installation script 2004-03-26 15:19:53 +00:00
Brian Paul
de0ee3187c New Makefile system 2004-03-26 15:19:11 +00:00
Brian Paul
a70ad91209 new system configurations 2004-03-26 15:16:35 +00:00
Brian Paul
f262b70d5a tweaks for 64-bit linux configs (Dan Schikore) 2004-03-26 14:21:18 +00:00
Brian Paul
68b38d2751 check for GLX 1.3 during init 2004-03-26 14:17:31 +00:00
Ian Romanick
3623579e43 Make sure drivers don't dereference a NULL pointer if
__driUtilCreateNewScreen returns NULL.
2004-03-26 02:02:48 +00:00
Brian Paul
301e55c6cd merge changes from 6.0.1 branch 2004-03-25 21:55:35 +00:00
Brian Paul
c05658d15e more Darwin tweaks 2004-03-25 21:18:32 +00:00
Brian Paul
77b47bb27b re-order arguments to mklib 2004-03-25 21:17:48 +00:00
Felix Kuehling
f28570679f Recalculate the viewport matrix in savageEmitDrawingRectangle. 2004-03-25 15:19:23 +00:00
Brian Paul
209fee4d33 silence warnings 2004-03-25 14:58:39 +00:00
Michal Krol
bb9054b96d The OpenGL Shading Language Runtime Library for Legacy Target.
Sounds good :)
2004-03-25 13:24:28 +00:00
Daniel Borca
f61487947b small changes (version string) 2004-03-25 09:06:12 +00:00
Brian Paul
16133d3cc1 added linux-x86-opteron (bug 922735) 2004-03-25 01:51:38 +00:00
Brian Paul
d3b09fe29b update my email address 2004-03-25 01:42:41 +00:00
Felix Kuehling
6e963e965c More state management changes:
- Don't lock in savageDDUpdateStatte, don't call savageEmitHwStateLocked
- Need to grab the lock for texture uploads now
- New SAVAGE_NEW_CULL bit in new_state to make sure that culling state and
  raster_primitive are not examined at the wrong times.
2004-03-25 01:16:27 +00:00
Felix Kuehling
adf33a1c6f Make sure hardware culling is disabled for unfilled primitives,
points and lines.
2004-03-24 22:05:25 +00:00
Brian Paul
844585be4c use Driver.WriteMonoRGBAPixels() when possible (Dan Schikore) 2004-03-24 17:17:25 +00:00
Felix Kuehling
e1e439c512 Missing in last commit. 2004-03-24 16:18:05 +00:00
Felix Kuehling
67d0343377 Buffer vertices and emit them in batches. Still using conventional drawing
commands, no vertex DMA.
2004-03-24 16:15:28 +00:00
Brian Paul
fda7215db3 rename class to c_class if using C++ (bug 922294) 2004-03-24 15:59:44 +00:00
Michal Krol
ae60852206 Slang internal include file defining constructors and operators
for built-in data types.
2004-03-24 15:02:37 +00:00
Brian Paul
aaba0751d5 tweaks to Darwin code 2004-03-23 23:25:47 +00:00
Brian Paul
19bb7f71f1 additional updates from Dan Schikore 2004-03-23 15:40:18 +00:00
Jouk Jansen
645778fe69 Committing in .
Adding s_auxbuffer.c for compilation

 Modified Files:
 	Mesa/src/mesa/swrast/descrip.mms
 ----------------------------------------------------------------------
2004-03-23 07:13:11 +00:00
Brian Paul
192c988c73 new DRI interface header 2004-03-22 23:31:29 +00:00
Brian Paul
b87c5d08c7 added some code to test buffer deletion 2004-03-22 16:28:02 +00:00
Brian Paul
f6a93d3dff use GL state vars instead of program parameters 2004-03-22 16:27:13 +00:00
Brian Paul
3b6eb90050 added s_auxbuffer.c 2004-03-22 16:23:15 +00:00
Dave Airlie
1cb63cfc98 more i810 to new interface 2004-03-21 23:35:14 +00:00
Felix Kuehling
03762ba8da ctx->Const.MaxTextureLevels is not the highest mipmap level but the number
> of levels, including 0.
2004-03-21 21:58:03 +00:00
Felix Kuehling
7e4a56d110 Improved MaxTextureLevel computation to take the nr. of tex units and both
texture heaps into account.
2004-03-21 18:50:21 +00:00
Brian Paul
57ff474cb0 added aux buffers item 2004-03-21 17:09:59 +00:00
Brian Paul
04da5cea31 test of aux buffer rendering 2004-03-21 17:07:30 +00:00
Brian Paul
894844a8d9 Implemented support for software-based AUX color buffers.
Only available with Xlib driver for now.
Assorted clean-ups related to Draw/ReadBuffer().
Renamed FRONT_LEFT_BIT -> DD_FRONT_LEFT_BIT, etc.
2004-03-21 17:05:03 +00:00
Brian Paul
0095016425 fix array index error in _swsetup_Translate (Felix) 2004-03-21 16:12:13 +00:00
Felix Kuehling
7ab89a9770 Removed some useless definitions, artifacts from the Utah-GLX i810 driver. 2004-03-21 12:05:24 +00:00
Dave Airlie
21fb1f9180 Add new interface support don't switch on yet .. 2004-03-21 11:47:03 +00:00
Felix Kuehling
416b7a8788 unsigned int -> uint32_t, unsigned char -> uint8_t where the size matters.
A bit more cosmetics.
Improved state emit on Savage 3D/IX/MX.
2004-03-21 11:28:07 +00:00
Felix Kuehling
9d68891901 Fixed texture LOD bias. 2004-03-20 22:05:29 +00:00
Felix Kuehling
fd8a7dc26b Fixed MAXFIFO_S4. Removed WAIT_IDLE_EMPTY from savage_BCI_swap which resulted
in another small speedup. Fixed a problem that was masked by that
WAIT_IDLE_EMPTY:
- flush command buffer and WAIT_IDLE_EMPTY before uploading textures
2004-03-20 19:40:09 +00:00
Felix Kuehling
ef8cb129f4 Cleaned up and fixed stencil fallback. 2004-03-20 17:12:06 +00:00
Brian Paul
a212e9670b minor clean-ups 2004-03-20 00:22:27 +00:00
Brian Paul
23be8efd6f make null-terminated copy of program string so that parse works correctly 2004-03-20 00:08:20 +00:00
Brian Paul
e29ac89dcd add missing else statements 2004-03-19 23:11:13 +00:00
Dave Airlie
00d2b873a9 Add includes to make mach64 build 2004-03-19 10:20:23 +00:00
Brian Paul
dde10b7c12 remove redundant call to ctx->Driver.Viewport(), and clean-ups 2004-03-18 18:17:33 +00:00
Brian Paul
ba9a2bd641 additional configs (Dan Schikore) 2004-03-18 16:02:27 +00:00
Brian Paul
c193bd0654 assorted updates and new AIX support (Dan Schikore) 2004-03-18 15:41:59 +00:00
Ian Romanick
6af3dca18a Convert int(8|32)_t to uint(8|32)_t, like should have been done the first time. 2004-03-18 00:16:44 +00:00
Ian Romanick
16c704e8f7 Convert all uses of CARD32 and CARD8 to int32_t and int8_t. 2004-03-17 20:50:12 +00:00
Dave Airlie
aae2fde0e6 remove version number faking, shouldn't be needed anymore 2004-03-15 23:27:33 +00:00
Dave Airlie
35de80d0cb extend SOLO code so the DDX version isn't checked 2004-03-15 23:26:49 +00:00
Keith Whitwell
c5fb1b7922 Sketch of codegen templates for t_vtx_api.c, not complete 2004-03-15 15:41:46 +00:00
Keith Whitwell
5262dcccc8 Streamline the error path in VertexAttrib functions. Makes things
slightly easier for codegen.
2004-03-15 14:36:16 +00:00
Daniel Borca
d83e9d9c00 unfinished SOLO driver for TDFX 2004-03-15 09:17:07 +00:00
Dave Airlie
e8036d23d7 couple of steps closer still not fully working.. something amiss in ring
buffer ..
2004-03-15 06:30:37 +00:00
Dave Airlie
6ff468d19e Initial i810_dri.c for miniglx isn't fully functional yet... 2004-03-15 05:20:08 +00:00
Dave Airlie
f4d07d4118 use utility function to check versions 2004-03-15 03:39:52 +00:00
Brian Paul
7d05e48478 more TRIANGLE_WALK_DOUBLE tweaks (Justin Novosad) 2004-03-14 18:12:06 +00:00
Brian Paul
3340a9ea9e fix stride bug in RGB and BGR span rendering 2004-03-14 16:41:49 +00:00
Brian Paul
746e59f207 GL_EXT_pixel_buffer_object test 2004-03-13 18:31:14 +00:00
Brian Paul
fde4c53a7d Added some comments. Minor const, int->GLint type changes, etc. 2004-03-13 18:27:06 +00:00
Brian Paul
7a6b71ef29 Implementation of GL_EXT_pixel_buffer_object extension.
Note: extension may not be finalized yet - subject to change!
Note: implementation not fully suitable for h/w implementation yet.
2004-03-13 18:21:40 +00:00
Brian Paul
5498e8b9f3 more descriptive error messages for matrix stack over/underflows 2004-03-13 16:32:58 +00:00
Jon Smirl
6ddfdff659 Adjust includes to help DRI build 2004-03-12 20:03:54 +00:00
Jon Smirl
d613cca2e4 Adjust mga drivers to remove redundant h file for sarea and IOCTLs 2004-03-12 05:22:13 +00:00
Jon Smirl
ba5c49ab42 Make R128 driver use sarea/defines from DRM. removed r128_common.h
and r128_sarea.h since they are redundant now.
2004-03-12 03:50:30 +00:00
Jon Smirl
5fb0763d2e These files are redundant now. Definitions come from DRM files. 2004-03-12 01:18:19 +00:00
Jon Smirl
ae4a1cc066 Adjustments to make everything use IOCTL/sarea defines in DRM instead
of glx/mini. removes glx/mini/drm.h glx/mini/sarea.h
2004-03-11 20:35:38 +00:00
Michal Krol
157ec8bcf8 Moved from src/mesa/main. 2004-03-10 18:02:01 +00:00
Brian Paul
ab928e57b9 don't futz with GL_CLIENT_ACTIVE_TEXTURE in glClientActiveTexture (Robert Merrill) 2004-03-10 16:17:35 +00:00
Michal Krol
30e6dda368 Fixed a number of typos. 2004-03-10 14:54:47 +00:00
Dave Airlie
7463640e17 add xmlconfig.c to solo build 2004-03-10 03:45:28 +00:00
Dave Airlie
d4b6724253 back port span changes from i810, these have been in my tree for a while seem
fine ..
2004-03-10 03:43:15 +00:00
Brian Paul
b2dd5095c4 remove unneeded casts 2004-03-09 18:04:04 +00:00
Brian Paul
1e4731f644 Fix color index mode rendering.
Changed SWvertex's index field to GLfloat and fix a few other bits.
2004-03-09 16:58:26 +00:00
Daniel Borca
7bcada8c27 fxMesa: remove buffer_obj_ext, cos it breaks UT2004 2004-03-09 11:23:39 +00:00
Felix Kuehling
15941b1d90 Cleaned up and slightly optimized the texture upload code. 2004-03-08 23:01:47 +00:00
Brian Paul
f76314a69a remove redundant macros (also in m_matrix.h) 2004-03-08 18:30:45 +00:00
Daniel Borca
0c19008f09 Voodoo Rush fixes 2004-03-08 07:52:18 +00:00
Felix Kuehling
446d8d0b86 Swapout textures who's space is claimed by a new texture. Don't destroy.
This finally really fixes assertion failures in savageBindTexture.
I think the same situation with several contexts is still broken though.
2004-03-08 00:34:43 +00:00
Felix Kuehling
a5c68c872d Fixed texture tiling format for 8bit texels on ProSavage and Twister. 2004-03-07 23:32:31 +00:00
Felix Kuehling
156df3e834 Rewrote tiled texture upload. Small mipmap levels work correctly now. 2004-03-07 20:41:42 +00:00
Felix Kuehling
2cd815b660 Fixed two small problems in the vertex setup.
- make sure that vertex setup is initialized
 - Savage seems to need the W coordinate for smooth shading
2004-03-07 01:36:50 +00:00
Felix Kuehling
2c8dacea5f Small texture management fixes. Should get rid of assertions some people were getting in savageBindTexture. 2004-03-04 22:11:38 +00:00
Brian Paul
9b71f621d1 plug in _mesa_BlendFunc into dispatch table 2004-03-04 17:14:08 +00:00
Brian Paul
d5e4f29cb9 a bunch of assorted clean-ups, etc to fix warnings, etc 2004-03-04 16:22:01 +00:00
Brian Paul
ff6031c209 remove some unneeded macros 2004-03-04 16:20:38 +00:00
Brian Paul
f753320f0f casts to silence warnings 2004-03-04 14:56:34 +00:00
Brian Paul
c26c1ddd56 silence warnings 2004-03-04 14:52:59 +00:00
Brian Paul
94ec525ba5 yet another take on VBO deleting and reference counting 2004-03-04 14:46:00 +00:00
Michal Krol
3f94cef027 Initial changes after moving from src/mesa/main/.
Needs testing - it havent been even compiled yet.
2004-03-04 13:15:32 +00:00
Michal Krol
a904b493a9 Added missing Copyrights. 2004-03-04 13:07:52 +00:00
Felix Kuehling
2462f6bfa0 Clearing rectangle was one too big in each direction. 2004-03-04 00:27:36 +00:00
Michal Krol
0e7b1d8811 Grammar package supporting 8-bit registers.
TODO:
  - add checking for duplicate symbols (or is it done already?)
  - move all the statics (grammar objects list and last error message)
    to the GL context state; I think simple pointer initialized in a
    first call to ProgramString() is sufficent.
  - apply an optimized version of match() - this will be needed for
    glslang compiler.
2004-03-03 18:10:40 +00:00
Michal Krol
e05d4fbf0f Added support for ARB_fragment_program_shadow. 2004-03-03 18:01:58 +00:00
Michal Krol
7bce486327 Initial registry for ARB_fragment_program and ARB_vertex_program. 2004-03-03 17:59:49 +00:00
Brian Paul
7c6a04f6d8 added clamping to polygon offset to prevent potential negative Z values and FP exceptions 2004-03-03 15:50:28 +00:00
Brian Paul
9a20a72cdc comments, capitalization, misc-clean-ups 2004-03-03 15:36:53 +00:00
Brian Paul
e22540c276 s/_swrast_exec_nv_fragment_program/_swrast_exec_fragment_program/ 2004-03-03 15:36:01 +00:00
Brian Paul
26895aa797 more changes to VBO reference counting and deletion 2004-03-03 15:35:08 +00:00
Daniel Borca
5ee631c6ee _tnl_allow_*_fog(...) 2004-03-03 09:07:43 +00:00
Daniel Borca
3abf2e4740 made NASM opcodes consistent 2004-03-03 09:03:40 +00:00
Felix Kuehling
fc17a6a35c Cope with float colors in VERT_SET_RGBA and VERT_SET_SPEC macros. 2004-03-02 23:48:32 +00:00
Felix Kuehling
2517a0ef21 Fixed some small state tracking issues while hunting a different problem. 2004-03-02 23:45:40 +00:00
Brian Paul
af745e5d4d fixed linux-osmesa16-static. Added linux-static config 2004-03-02 17:28:56 +00:00
Brian Paul
411b8faac4 added missing error check in _mesa_BeginQueryARB (Cedric Gautier). minor clean-ups. 2004-03-02 15:21:51 +00:00
Daniel Borca
fa21787b52 workaround for crash-upon-exit in verbose mode
fxMesa now uses grQueryResolution
minor fixes to X11 and DOS drivers
2004-03-02 08:15:24 +00:00
Roland Scheidegger
725a56f157 Fix calling fallback_drawarrays() with the wrong arguments 2004-03-01 23:29:27 +00:00
Roland Scheidegger
8cff2ede6e Add support for the new DRI driver interfaces to the radeon driver (patch ported from the r200 driver, r200_screen.c rev. 1.8 - 1.12) 2004-03-01 17:49:59 +00:00
Michel Dänzer
dbb0d2751f Inline get_size as an interim measure to get rid of function call overhead. 2004-03-01 13:02:29 +00:00
Felix Kuehling
cac8d425a8 Corrected the maximum vertex size argument of _tnl_init_vertices. 2004-02-29 20:43:54 +00:00
Felix Kuehling
c6338e60ff Reorganized hardware state data structures and state emission. Don't track
which registers changed in all the functions that change the state. Instead
check which registers changed in the end when the hardware state is updated.
Tried to avoid cosmetic (whitespace) changes in this commit.
2004-02-29 20:42:22 +00:00
Brian Paul
4923e1926a Remove clamp parameter from _mesa_unpack_color_span_float(). Pass the
IMAGE_CLAMP_BIT if needed.
Added ClampVertexColors and ClampFragmentColors to GLcontext in anticipation
of upcoming extensions (not fully used yet).
2004-02-28 22:30:58 +00:00
Brian Paul
94f9d4c0dd minor clean-ups 2004-02-28 21:19:27 +00:00
Brian Paul
833d96aa91 consolidate image transfer operations in new _mesa_apply_rgba_transfer_ops() function 2004-02-28 21:10:19 +00:00
Brian Paul
8cfd08b613 rename some span pack/unpack functions for better uniformity 2004-02-28 20:35:57 +00:00
Brian Paul
d0582776a6 move _swrast_texture_table_lookup() to _mesa_lookup_rgba_chan() 2004-02-28 20:12:33 +00:00
Brian Paul
456734aa0a consolidate some code 2004-02-28 19:58:19 +00:00
Brian Paul
aaad687d51 replace color table FloatTable boolean with Type enum 2004-02-28 19:34:05 +00:00
Brian Paul
d14da2d5ae paltex demo from recent texcombine changes. Minor clean-ups 2004-02-28 19:33:03 +00:00
Michel Dänzer
e2df3d01af Only print message about disabling HW TCL if the chip supports it in the
first place, and make the message a bit clearer.

+ Remove some extraneous whitespace.
2004-02-28 13:25:25 +00:00
Ian Romanick
1cb11ce1c5 Create all the right modes for 16-bit screens. 2004-02-27 19:12:29 +00:00
Ian Romanick
ad1e06fafe Fix a problem with 24-bit screens. Modes with 0 stencil bits were
erroneously marked as GLX_SLOW_CONFIG.
2004-02-27 19:11:08 +00:00
Brian Paul
db79b5683c move _mesa_load_state_parameters() to state validation stage 2004-02-27 02:13:29 +00:00
Brian Paul
579ea7ff7a fix PK2H, UP2H, PK2US bugs 2004-02-27 01:28:24 +00:00
Brian Paul
fca9121a21 check for null paramList 2004-02-26 22:20:29 +00:00
Brian Paul
e6149fac64 check for invalid fragment program in glDrawPixels, glCopyPixels and glBitmap 2004-02-26 22:13:32 +00:00
Brian Paul
1ef3d3a758 check for invalid vertex/fragment program in glBegin 2004-02-26 22:09:28 +00:00
Brian Paul
04207ab7e2 fix another glDrawArrays indexing bug, jump through _glapi_Dispatch functions 2004-02-26 22:09:05 +00:00
Brian Paul
09a4f915d3 fix library naming glitches (bug 904867) 2004-02-26 15:21:41 +00:00
Brian Paul
c8957aa896 Fix C/C++ calling conventions problem (Bug 904854) 2004-02-26 14:58:11 +00:00
Felix Kuehling
89d04e4623 Set ctx->Const.MaxTexture[Image/Coord]Units correctly. Fixes corruption in q3. 2004-02-26 13:22:16 +00:00
Felix Kuehling
76283a9079 Adapt the VERT_SET/COPY/SAVE/RESTORE_RGBA/SPEC macros to copy with all savage vertex formats. 2004-02-26 12:19:41 +00:00
Felix Kuehling
229654d815 Forgot to remove savagevb.h in last commit. 2004-02-26 01:00:00 +00:00
Felix Kuehling
d9a0330872 Converted vertex setup to use t_vertex.[ch]. 2004-02-26 00:59:00 +00:00
Ian Romanick
795f1faf81 Create all the right modes for 16-bit screens. 2004-02-26 00:33:22 +00:00
Brian Paul
04bcaac383 added _tnl_allow_vertex/pixel_fog() calls 2004-02-26 00:28:03 +00:00
Felix Kuehling
21893e56e0 Call _tnl_allow_pixel/vertex_fog in savageCreateContext. (Brian Paul) 2004-02-25 20:47:46 +00:00
Brian Paul
54056db8db use ABS(Z) when computing blend factors 2004-02-25 16:14:16 +00:00
Brian Paul
20e25ca50a call _tnl_allow_pixel/vertex_fog() funcs 2004-02-24 16:11:30 +00:00
Brian Paul
8d407300c2 turns out we probably need a _tnl_allow_pixel_fog() function afterall 2004-02-24 16:10:52 +00:00
Brian Paul
4d5dddd125 jump through dispatch table instead of calling gl functions directly 2004-02-24 15:08:22 +00:00
Brian Paul
9d1ff8c1bb fix incorrect texcoord attribute index 2004-02-24 14:59:26 +00:00
Brian Paul
2615e81620 added some GLAPIENTRY keywords, minor clean-ups 2004-02-24 14:47:01 +00:00
Brian Paul
4a048e5e48 s/transform/tnl/ 2004-02-24 04:57:48 +00:00
Brian Paul
0adce8f7c7 upgraded to version 22 2004-02-24 03:01:27 +00:00
Brian Paul
1e3d868ffb Yet another revision of _ae_update_state(). Issue both conventional AND
generic vertex attribute commands, ignoring ctx->VertexProgram.Enabled
since this function may be used during display list compilation.
2004-02-24 02:49:43 +00:00
Brian Paul
0f1e19c03c added some const keywords 2004-02-24 02:47:05 +00:00
Brian Paul
ffa7eff9ff glDrawArrays loop was wrong 2004-02-24 02:42:46 +00:00
Brian Paul
cf20f8cc3f updates from Erdi Chen 2004-02-23 21:07:12 +00:00
Brian Paul
537f42e240 fix typo (Matt Case) 2004-02-23 20:26:58 +00:00
Ian Romanick
c00fbd55ba The available GLX version is now logged in addition to the client
version and the server version.
2004-02-23 17:37:36 +00:00
Dave Airlie
001dc022fc delete the textures 2004-02-23 06:35:22 +00:00
Felix Kuehling
263581bba4 Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS
with modifications to make it work with current Mesa 6.
2004-02-22 16:11:12 +00:00
Brian Paul
6e450f22bb some minor tweaks 2004-02-21 18:08:41 +00:00
Daniel Borca
2aa84490c0 fixed some typos 2004-02-20 09:47:42 +00:00
Ian Romanick
304d3aa9cb Refactored several variables out of XMesaVisual in favor of identical
fields in __GLcontextModes (the base type).  Removed the need to keep
the XMesaVisualInfo pointer when building inside the X-server.
2004-02-19 00:57:04 +00:00
Brian Paul
e01370271e recent bug fixes/changes (fog, glArrayElement, triangle rasterization) 2004-02-17 23:38:05 +00:00
Brian Paul
0733dbb011 A few more tweaks to fog code.
Remove unneeded FABSF() macros.
Added blend factor clamping in a few spots.
2004-02-17 22:14:18 +00:00
Brian Paul
4e41eb1061 compute fog coord in eye space, not clip space 2004-02-17 22:00:45 +00:00
Brian Paul
09da0b8e66 A bit of an overhaul of the fog code.
glFogCoord didn't always work reliably.
ARB fragment program fog options work now.
Per-fragment fog computations are now perspective corrected.
2004-02-17 21:03:03 +00:00
Brian Paul
9a389d4bdb define DO_FRAGMENT_FOG=1 to test fragment program fog option 2004-02-17 17:59:59 +00:00
Brian Paul
a60c89e8c8 added SPAN_W 2004-02-17 14:08:23 +00:00
Brian Paul
230ebaff2a just some reformatting 2004-02-17 04:28:37 +00:00
Brian Paul
4250c7acac some debug code 2004-02-17 04:26:42 +00:00
Brian Paul
5cd79f9267 added FogOption to fragment_program struct 2004-02-17 04:25:24 +00:00
Brian Paul
c2f6d6d092 added FixedToDouble() macro 2004-02-17 04:24:52 +00:00
Brian Paul
84b4a3a087 Added TRIANGLE_WALK_DOUBLE to optionally walk triangle edges with GLdoubles
instead of GLfixed. (Justin Novosad)
2004-02-17 03:51:47 +00:00
Roland Scheidegger
bb1dcb4fad texture env combine refactor (Andreas Stenglein), following the same principles as the refactored code already present in the R200 driver 2004-02-16 17:34:03 +00:00
Brian Paul
64d6ddabaa remove incorrect negation in fog coord computation 2004-02-16 16:44:40 +00:00
Keith Whitwell
477363455d Add _tnl_set_attr() to complement existing get_attr() call. 2004-02-16 15:15:24 +00:00
Keith Whitwell
7b5199e8a4 glutInitWindowPosition 2004-02-16 14:45:56 +00:00
Daniel Borca
45f4c5ec3b cleanup and some WGL PIXELFORMAT issues 2004-02-16 07:32:27 +00:00
Daniel Borca
a49a08d014 fog_coord demo 2004-02-16 07:31:29 +00:00
Brian Paul
05ad3078a9 some code clean-ups 2004-02-15 17:45:17 +00:00
Brian Paul
7c4a61c57f Minor clean-ups of variable scopes, initializations, etc.
New comments discussing FIXED_FRAC_BITS, SUB_PIXEL_BITS, max viewport size
and rasterization accuracy.
2004-02-15 16:21:07 +00:00
Keith Whitwell
0200947f5e Remove debug 2004-02-14 15:49:55 +00:00
Keith Whitwell
964e5325bd Make it easier for drivers to create "subclasses" of the existing
program struct hierarchy.

Add driver callbacks to enable the above and make it possible to track
more changes to program objects.
2004-02-14 15:00:42 +00:00
Brian Paul
70dacabfe5 added note about kernel modules 2004-02-13 18:29:42 +00:00
Ian Romanick
659dce40e2 Minor tweaks to get the fbconfig list returned by __driCreateNewScreen
to pass through filter_modes (in libGL) properly.
2004-02-13 17:38:41 +00:00
Brian Paul
9ad80a475d info about precompiled libs for Solaris 2004-02-13 15:50:13 +00:00
Brian Paul
88bf038708 init secondary color to (0,0,0,1). remove some redundant initializations. 2004-02-13 15:30:08 +00:00
Brian Paul
85ad44b292 set buffer object default Usage and Access 2004-02-13 14:04:26 +00:00
Brian Paul
de47068b85 new comments, rename some stuff 2004-02-13 03:00:11 +00:00
Ian Romanick
71996ddbe1 Fix a problem that caused the new interface code to not actually be
used.  Fix a couple problems that confound the fbconfig filtering code
in libGL.
2004-02-12 23:03:19 +00:00
Ian Romanick
0370d0829b Enable use of new DRI interface in MGA driver. 2004-02-12 22:59:03 +00:00
Brian Paul
193d211a19 Minor re-org of state for fog and precision options. 2004-02-12 21:57:29 +00:00
Brian Paul
5396ab2742 bunch of assorted updates/changes 2004-02-12 14:48:52 +00:00
Dave Airlie
d03814f426 minor cleanups from t_dd_vb.c 2004-02-12 12:05:54 +00:00
Dave Airlie
7b6ceb5b12 remove vertex_stride_shift, fix up code to not need it 2004-02-12 11:52:38 +00:00
Dave Airlie
da8337ed5e fix up specular color/fog and triangle vertex retrieval 2004-02-12 11:20:29 +00:00
Dave Airlie
9a78c29f7a fixup vertex building code .. 2004-02-12 06:39:57 +00:00
Dave Airlie
d2f0be152e more updates , gears sorta works 2004-02-12 01:57:43 +00:00
Brian Paul
0d4393a38a Fix the problem found with UT after I had added support for glVertexAttrib.
The problem came from using the _glapi_Dispatch->VertexAttrib*fvNV pointers
since they can change from one glArrayElement call to the next.
2004-02-11 22:53:38 +00:00
Dave Airlie
d4baed717f initialise VBLANK 2004-02-11 22:53:12 +00:00
Brian Paul
2020278d06 Do more bookkeeping of vertex buffer object reference counts.
Incr/decr counts when doing glPush/PopClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT).
2004-02-11 22:06:05 +00:00
Ian Romanick
840e82163d Added a test case for Mesa bug #508473 that I wrote a long time ago.
Fixed the Makefile.X11 to actually build glxgears_fbconfig when
invoked from the top level.
2004-02-11 20:16:26 +00:00
Ian Romanick
0b87abd11b Initial pass at adding support for the new DRI driver interfaces to
the R200 driver.  Not as clean / well commented as it should / could be.
2004-02-11 08:11:58 +00:00
Ian Romanick
1d6e08db95 Added yet another version of gears. This one uses fbconfigs, and is a
rudimentary test of fbconfigs that doesn't use pbuffers of
GLX_SGI_make_current_read.
2004-02-11 08:00:42 +00:00
Roland Scheidegger
faaf78aeb0 revert to version 1.18 for now to fix segfaults in some applications 2004-02-11 01:06:03 +00:00
Roland Scheidegger
f64f940281 change lighting to use MULT instead of PREMULT (i.e. move some lighting color calculations to the GPU) 2004-02-10 23:52:18 +00:00
Brian Paul
53c50f1667 some useful matrix functions 2004-02-10 23:41:20 +00:00
Daniel Borca
22633805fa fixed back fxMesaGetCurrentContext to match MakeCurrent 2004-02-10 07:46:07 +00:00
Roland Scheidegger
a1b9b1a440 Changed lighting to use SOURCE_MATERIAL instead of PREMULT (moves some light color calculations to the GPU). Two-side lighting fallback no longer needed and eliminated. 2004-02-10 02:20:29 +00:00
Daniel Borca
1440f73212 reorganized DMesa to fxMesa wrapper 2004-02-09 08:46:38 +00:00
Daniel Borca
89625ef634 deal with combine_ext refactor 2004-02-09 07:39:03 +00:00
Brian Paul
53ad036972 Restore some of the previous code for handling conventional vertex attributes
more efficiently.
Remove switches/conditionals from vertex attribute wrappers.
glMultiTexCoord is implemented in terms of glVertexAttrib.
2004-02-09 00:24:48 +00:00
Brian Paul
646dffd44d tweak solaris-x86-gcc and ggi targets 2004-02-08 17:17:09 +00:00
Brian Paul
0aa8a1062a Updated to handle generic vertex attributes accessed vi glArrayElement().
In fact, handle all conventional vertex attributes in terms of generic
attributes (execept for edge flags and color indexes).
2004-02-08 02:03:41 +00:00
Brian Paul
08a45d4d4f fully parameterize the macros for fixed-point arithmetic 2004-02-08 00:37:32 +00:00
Brian Paul
875f763c9f added an additional comment about mipmap generation 2004-02-08 00:36:56 +00:00
Brian Paul
529614cd1a implement Fake_glXCreateWindow() to fix bug #890894 2004-02-08 00:11:14 +00:00
Daniel Borca
54447772d5 removed MGA driver from DMesa 2004-02-07 10:56:13 +00:00
Daniel Borca
d039b43e30 added NUL driver for DMesa 2004-02-07 10:54:36 +00:00
Ian Romanick
07d6a98359 Refactor "class" texture environments to be implemented in terms of
ARB_texture_env_combine state.
2004-02-06 17:39:03 +00:00
Roland Scheidegger
c71ee917e3 inform driver of changed wrap/filter parameters due to binding of nv_texrect texture 2004-02-06 15:27:42 +00:00
Roland Scheidegger
4c6b629b38 remove bogus check of texture target in R200TexParameter 2004-02-06 15:25:37 +00:00
Roland Scheidegger
c2f28a3fd1 align blits for texture rectangles correctly, fix potential problem overwriting dma region 2004-02-06 15:24:51 +00:00
Roland Scheidegger
786e822cd4 fix potential problem overwriting dma region 2004-02-06 15:23:20 +00:00
Roland Scheidegger
531b59db3c remove bogus check of texture target in RadeonTexParameter 2004-02-06 15:20:59 +00:00
Brian Paul
e5a94ba138 Added flags for _all_ extensions to the gl_extensions struct so that drivers
can disable any extension if necessary.
2004-02-06 02:01:47 +00:00
Brian Paul
1f3d9eedad added GLU_INCOMPATIBLE_GL_VERSION 2004-02-06 01:17:30 +00:00
Dave Airlie
74eeb37c00 fix missing include for SOLO build 2004-02-06 00:42:58 +00:00
Dave Airlie
6c7bb5ebbd Remove warnings from mach64 build, fix up some _SOLO stuff,
update to newer Mesa interfaces...
2004-02-06 00:16:26 +00:00
Dave Airlie
0fbeff2fa2 Initial mach64 driver import for DRI mach64-0-0-6 branch,
this compiles but I doubt it works but it is a better starting point
than the branch
2004-02-05 22:45:00 +00:00
Keith Whitwell
493e6e1e90 Add comments to make decyphering the faces easier 2004-02-05 17:36:02 +00:00
Brian Paul
c2f739169e update function mangling and add comment about it to gl.h 2004-02-05 15:23:12 +00:00
Brian Paul
e2e9dc221d bring in Keith's _math_matrix_ortho() compiler work-around 2004-02-05 15:05:09 +00:00
Dave Airlie
540bb3a830 fix ugly bug triggered by macro expansion 2004-02-05 06:39:20 +00:00
Brian Paul
b3063ac398 fix glXChooseFBConfig bug 890167 2004-02-04 23:39:19 +00:00
Brian Paul
ef18e23bf8 fix typo 2004-02-04 23:36:00 +00:00
Keith Whitwell
36ff43b596 Fix off-by-one in calculations for wrapped trifan, polygon primitives 2004-02-04 16:59:30 +00:00
Brian Paul
b19cb627e0 fix stores to vertex state program registers 2004-02-04 15:44:53 +00:00
Keith Whitwell
72aeea4eea Use quads instead of lines to ensure this is testing stencil functionality
rather than rasterization.  A crutch to hw with wonky line
rasterizers.
2004-02-04 15:27:39 +00:00
Brian Paul
867fa0b572 another tweak to two-sided detection test 2004-02-04 03:34:30 +00:00
Brian Paul
609f35274c fix two-sided lighting / vertex program bug (#887330) 2004-02-04 03:00:42 +00:00
Brian Paul
d761adad5d added Daniel Stone for getting CVS access 2004-02-03 23:36:59 +00:00
Brian Paul
b6a9cb7095 another pbuffer demo (Andrew Lentvorski) 2004-02-03 16:23:38 +00:00
Brian Paul
20c831bb89 s/getenv/_mesa_getenv/ 2004-02-02 22:36:58 +00:00
Brian Paul
b07d6a8158 updated list of env vars 2004-02-02 22:35:55 +00:00
Felix Kuehling
cc5d045744 Include context.h in radeon_state.c. 2004-02-02 21:26:40 +00:00
Brian Paul
3a99674980 glXChooseFBConfig() didn't handle GLX_FBCONFIG_ID option 2004-02-02 15:40:21 +00:00
Brian Paul
18a949000c tweak comments 2004-02-02 15:38:26 +00:00
Daniel Borca
61bc62cc40 added glutGetProcAddress in DMesaGLUT 2004-02-02 07:47:23 +00:00
Daniel Borca
4c7883e402 fixed a bug in GL_NEAREST sampler 2004-02-02 07:46:27 +00:00
Brian Paul
c9e1c8098b added display list option (l key) 2004-01-31 19:57:25 +00:00
Brian Paul
1e71d2af5e minor #ifdef fix 2004-01-31 19:49:10 +00:00
Brian Paul
6bbcae9473 added _NEW_PROGRAM to check_state flags for pipeline stages (fixes vparray demo bug) 2004-01-31 19:39:04 +00:00
Brian Paul
27ec7a5bf1 add vparray.c, fix indentation 2004-01-31 19:15:57 +00:00
Brian Paul
919404fd1d enable program and arrays by default, minor clean-ups 2004-01-31 19:15:43 +00:00
Brian Paul
041e66b0d6 don't call gl functions directly, jump through _glapi_Dispatch table 2004-01-31 19:08:45 +00:00
Brian Paul
f5dbba7ec3 add missing CXX, CXXFLAGS for osf1 (Bug 886628) 2004-01-31 17:12:19 +00:00
Brian Paul
111156affe glBindProgramARB wasn't getting compiled into display lists (bug 887383) 2004-01-30 23:36:35 +00:00
Brian Paul
26baf96bea added unichrome directory 2004-01-30 23:32:19 +00:00
Brian Paul
f924a933b4 Minor fixes for recent Mesa 6.1 changes 2004-01-30 23:31:51 +00:00
Brian Paul
f18598cbd2 Via Unichrome/cle266 driver (Erdi Chen) 2004-01-30 23:26:19 +00:00
Brian Paul
2726d77b2e more descriptive error strings 2004-01-30 17:39:11 +00:00
Keith Whitwell
bacd9d1739 Fix extract_3f_xyw(). 2004-01-30 11:16:12 +00:00
Brian Paul
229d6a9624 replace spaces w/ tabs 2004-01-29 16:32:18 +00:00
Daniel Borca
4fe1303e83 GL_TEXTURE_1D and other stories... 2004-01-29 15:46:02 +00:00
Brian Paul
f8c31fcba3 more IRIX tweaks 2004-01-29 15:21:47 +00:00
Brian Paul
dc8f8bd88f fix ARCHOPT typo 2004-01-29 14:46:16 +00:00
Brian Paul
9ca723f5f5 fix C++ link issues on IRIX 2004-01-28 22:54:33 +00:00
Karl Schultz
b72902e061 Add GLAPIENTRY function decorations for correct operation on Windows. 2004-01-28 22:24:12 +00:00
Brian Paul
5e83c2a081 tweak the #if test for defining _ASMAPI (fixes IRIX problem) 2004-01-28 22:01:47 +00:00
Brian Paul
938014f850 minor fixes to glw's touch depend 2004-01-28 22:00:13 +00:00
Karl Schultz
77650b4672 Fix compiler options regarding exception handing to resolve warnings. 2004-01-28 19:46:12 +00:00
Karl Schultz
1ce9940c79 Avoid setting NOWIN98 compiler optimization with VC 7. 2004-01-28 19:00:34 +00:00
Ian Romanick
253428f06a Fixed a cut-and-paste bug from the BlendFuncSeparate driver interface
change.
2004-01-28 17:35:49 +00:00
Alan Hourihane
29b2ced167 fix printf warnings 2004-01-28 16:28:53 +00:00
Brian Paul
e8df62b5a7 patch from bug 885992 2004-01-28 15:15:14 +00:00
Brian Paul
c24d40b178 s/BlendEquatioRGB/BlendEquationRGB/ 2004-01-28 15:14:09 +00:00
Keith Whitwell
eabe7beeaa add glutInitWindowPosition calls 2004-01-28 10:09:59 +00:00
Keith Whitwell
469d1b0f22 Add glutInitWindowPosition call 2004-01-28 10:07:48 +00:00
Keith Whitwell
27413ed249 Move FRAG_BIT_ definitions to mtypes.h so that NEED_SECONDARY_COLOR() macro
works globally.
2004-01-28 09:29:21 +00:00
Keith Whitwell
43b5772834 Use NEED_SECONDARY_COLOR() for checking specular state at all times
when ctx->_TriangleCaps might be inaccurate (ie while ctx->NewState might
be non-zero).
2004-01-28 08:21:05 +00:00
Dave Airlie
c78a89d761 fix breakage associated with pointers not being initialised in
mesa_create_context
2004-01-28 03:58:49 +00:00
Brian Paul
5102075330 change PFNGLXGETUSTPROC's argument from uint64_t to int64_t to match the DRI 2004-01-27 22:44:35 +00:00
Ian Romanick
74cf25b081 Missed this commit as part of the addition of
GL_EXT_blend_equation_separate / GL_ATI_blend_equation_separate.
2004-01-27 21:40:35 +00:00
Ian Romanick
c93105eb9e Added support for EXT_blend_equation_separate / ATI_blend_equation_separate.
The internal driver interface was also changed to use
BlendEquationSeparate instead of BlendEquation.
2004-01-27 18:52:40 +00:00
Keith Whitwell
dd9e6e7e37 Catch and shortcircuit no-primitive and no-vertex cases in _tnl_wrap_buffers() 2004-01-27 18:44:50 +00:00
Karl Schultz
da2be88f18 Add new driverfuncs. 2004-01-27 18:28:58 +00:00
Keith Whitwell
18fa367ac6 Consolidate texObj->Pos/Neg/X/Y/Z and texObj->Image into a single
array, texObj->Image[face][level].
2004-01-27 16:34:45 +00:00
Keith Whitwell
740f7de085 Tweak: set z scale to one, else tnl thinks we have a 3d texcoord. 2004-01-27 16:18:00 +00:00
Brian Paul
727d345b41 remove bogus assertion in DeleteTexture() function 2004-01-26 23:57:19 +00:00
Felix Kuehling
8135a445f3 Make the drivers using the common texmem code work with NewTextureObject
in Mesa. This is analogous to changes idr made to the r200 driver. Patch
submitted by Andreas Stenglein.
2004-01-26 23:38:12 +00:00
Keith Whitwell
ef167c6328 Fix for recursion in generic_copy_pv_extras.
Add a comment.
2004-01-26 21:34:28 +00:00
Brian Paul
cb7c689e14 replace MALLOC w/ CALLOC to silence valgrind warnings 2004-01-26 16:16:16 +00:00
Keith Whitwell
ab41a96ae7 Add tests for ARB_fp trig instructions and also for 1D texturing 2004-01-26 13:45:42 +00:00
Daniel Borca
5d3568f36c minimize the number of DIVs 2004-01-26 10:43:50 +00:00
Daniel Borca
8d2cfa9ea0 glutTimerFunc cleanup 2004-01-26 10:41:39 +00:00
Daniel Borca
d3682ce376 accomodate FetchTexel and fix some memory leak bugs 2004-01-26 10:38:46 +00:00
Brian Paul
c9d2f4ca47 updated GLUT link 2004-01-26 00:30:08 +00:00
Brian Paul
1749a25ca8 New error checking in _mesa_GetTexImage().
Updated comments and some better function parameter names.
2004-01-24 17:17:25 +00:00
Brian Paul
fe03108ce0 Some initial RGB and RGBA floating point texture formats. 2004-01-24 17:02:19 +00:00
Brian Paul
c6bf130e98 initial info for version 6.1 2004-01-24 16:53:20 +00:00
Brian Paul
b4b35bcc42 New glXUseRotatedXFontMESA() function. Like glXUseXFont(), but takes
a rotation parameter (either 0, 90, 180 or 270 degrees).
Also, a demo program.
2004-01-24 16:50:35 +00:00
Brian Paul
eaaf618bb8 added link to ORSA (per request) 2004-01-24 15:20:24 +00:00
Felix Kuehling
83e0cfb8a0 Parse radeon, not r200 configuration in radeonCreateContext. 2004-01-24 14:41:24 +00:00
Michel Dänzer
78bb0803cf Fix hardware ROP state handling (Roland Scheidegger) 2004-01-24 12:35:13 +00:00
Brian Paul
4d859f73fc added device driver hooks for BindProgram, NewProgram, DeleteProgram 2004-01-23 18:57:05 +00:00
Brian Paul
f2ce4dc7da Change software alpha plane pointers from void* to GLchan*, eliminate some casts. 2004-01-23 18:56:25 +00:00
Brian Paul
292615071a more fixing for tdfxUpdateTexturePalette 2004-01-23 18:51:00 +00:00
Brian Paul
7f7b2d86bc a few more tweaks 2004-01-23 16:08:35 +00:00
Brian Paul
75a0d31aaa fix assorted compilation issues 2004-01-23 16:03:33 +00:00
Daniel Borca
3d06dc7581 accomodated new driver_func initialization
added DMesaGetProcAddress
some other minor fixes
updated documentation
2004-01-23 15:57:52 +00:00
Keith Whitwell
3abf746a7e Don't set extra bits in FLUSH_VERTICES, fix several state bugs. 2004-01-23 14:46:27 +00:00
Jouk Jansen
5c161cf615 Committing in .
Trying to remove the <CR> at the end of each line.

 Modified Files:
 	Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 ----------------------------------------------------------------------
2004-01-23 10:13:40 +00:00
Ian Romanick
ff2cc41ccb Modified error messages in _mesa_BlendFuncSeparateEXT to note that the
same function is used internally for glBlendFunc and
glBlendFuncSeparate.
2004-01-23 07:57:32 +00:00
Michel Dänzer
a2c97eb2ff Call UpdateMaterial() unconditionally on GL_COLOR_MATERIAL state change
(Roland Scheidegger), and update lighting state unconditionally there.
Fixes lighting oddities in the xscreensaver endgame hack, bzflag and
possibly elsewhere.
2004-01-23 03:33:04 +00:00
Michel Dänzer
5d00e131d8 Fix attenuation hardware state handling, inspired by the R200 DDK reference
driver (our r200 driver basically didn't do this at all, maybe got lost
along the way?)
2004-01-23 03:19:47 +00:00
Brian Paul
4f295cee73 Initial support for floating point and signed texture formats.
New "FetchTexelFuncF()" function returns texels in floating point format.
Only used for depth component images at this time.
Changed original FetchTexelFunc to return GLchan instead of GLvoid, removing
need for a bunch of ugly casts.
2004-01-23 01:59:54 +00:00
Brian Paul
edd1d86c74 misc updates 2004-01-23 01:56:26 +00:00
Keith Whitwell
dca71ea44b Minor tweaks to help out at a driver level. 2004-01-22 22:40:40 +00:00
Ian Romanick
004d71f554 Corrected a comment about how the DOT3 hardware works in the R200. 2004-01-22 16:25:02 +00:00
Jouk Jansen
03166f73f3 Committing in .
Updated OpenVMS compile support

 Modified Files:
 	Mesa/Makefile.X11 Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 Added Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 ----------------------------------------------------------------------
2004-01-22 15:02:17 +00:00
Ian Romanick
afa446db83 Silence some compiler warnings. 2004-01-21 17:03:58 +00:00
Ian Romanick
169223c9ee Make the R200 driver work with the NewTextureObject in Mesa. Other
drivers that use the texmem interface will likely need similar changes.
2004-01-21 16:42:30 +00:00
Ian Romanick
34a7857411 Silence a compiler warning DRI builds using gcc3. 2004-01-21 16:26:05 +00:00
Keith Whitwell
66691ef5b5 Use new EMIT_PAD functionality for spec and/or fog as available.
Fix a couple of problems with texture emit.
2004-01-21 16:24:05 +00:00
Ian Romanick
20a17e42d7 Remove dd_function_table::BlendFunc. All drivers now use
dd_function_table:BlendFuncSeparate.  If a driver does not actually
support EXT_blend_func_separate, it can assume that the RGB and alpha
blend functions are the same.
2004-01-21 16:08:43 +00:00
Keith Whitwell
4d36f334c9 Another mechanism to create vertices with holes - a new EMIT_PAD style 2004-01-21 15:31:46 +00:00
Brian Paul
e98986bdd3 don't call glVertex functions directly, call _glapi_Dispatch->Vertex(), etc 2004-01-21 04:13:49 +00:00
Brian Paul
a999e809af remove _mesa_check_driver_hooks() - it's really not too useful anymore 2004-01-20 23:55:45 +00:00
Brian Paul
4e713913fb Undo some bits from last check-in related to the ctx->Driver.NewTextureObject
functions.  Don't allocate the driver-specific data during texture object
creation but do it later as needed (as code originally was).
2004-01-20 15:24:50 +00:00
Daniel Borca
d4636e74c8 fixed a bug in VGA initialization routine 2004-01-20 14:15:35 +00:00
Keith Whitwell
e755144e79 remove duplicate t_dd_* files 2004-01-20 11:22:20 +00:00
Brian Paul
d8059008a2 initial 6.1 release notes with info about recent _mesa_create_context changes, etc. 2004-01-20 02:54:51 +00:00
Brian Paul
d3fd7ba8af Before calling _mesa_create_context(), initialize a dd_function_table struct
by calling _mesa_init_driver_functions() and then plugging in the driver-
specific functions.
In particular, make sure ctx->Driver.NewTextureObject points to the
appropriate driver function so that _all_ texture objects are augmented
with the driver-specific data.
Put in a bunch of assertions in the texture-related driver functions that
texObj->DriverData is valid.  Remove old dead code in near future.
2004-01-20 02:49:27 +00:00
Brian Paul
988a8862c8 _mesa_init_driver_functions() to initialize dd_function_table 2004-01-20 02:36:44 +00:00
Keith Whitwell
8d97ad18a7 some more count vs. end confusion 2004-01-19 23:29:40 +00:00
Brian Paul
6bf808bc6c replace -lm with $(GL_LIB_DEPS) to get -lexpat 2004-01-19 18:06:30 +00:00
Brian Paul
9c0b83556d replace CALLOC with MALLOC in _mesa_new_texture_object() 2004-01-19 17:41:02 +00:00
Brian Paul
c929f13701 remove incorrect comments, added _mesa_bzero() call in _mesa_initialize_texture_object() 2004-01-19 17:35:41 +00:00
Brian Paul
75c8a2e7be omit CVS directories from tarballs, bump version to 6.1 2004-01-19 16:56:50 +00:00
Keith Whitwell
ed43ecee90 Migrate i830 driver to t_vertex.[ch] for building hw vertices. 2004-01-19 10:41:35 +00:00
Brian Paul
41abe9e73f fix glitch from previous check-in (pointer vs int) 2004-01-19 00:32:43 +00:00
Brian Paul
77d240858e minor changes to silence warnings 2004-01-18 17:22:50 +00:00
Brian Paul
6a82d44d9c Change get_ust_nop()'s parameter from int64_t to uint64_t to silence warnings. 2004-01-18 17:22:25 +00:00
Brian Paul
87745ce771 change Data ptr from GLbyte to GLubyte to silence warnings 2004-01-18 17:21:15 +00:00
Brian Paul
013dee06c1 include texobj.h to silence warnings 2004-01-18 17:20:41 +00:00
Brian Paul
e093e94298 s/char/GLubyte/ to silence warnings 2004-01-18 17:19:45 +00:00
Brian Paul
ef77464a7a include sched.h to get sched_yield() prototype 2004-01-18 17:19:05 +00:00
Brian Paul
97fcc0e77b make second param of driParseConfigFiles() const 2004-01-18 17:18:43 +00:00
Brian Paul
5b9a9d46d4 tweak OpenBSD and SunOS commands 2004-01-17 18:31:12 +00:00
Brian Paul
4eb16e3a67 tweak openbsd config 2004-01-17 18:30:52 +00:00
Brian Paul
66f2fd89ea added some missing FLUSH_VERTICES calls 2004-01-17 17:33:22 +00:00
Michel Dänzer
8d83242c8c Fix cosmetic GL_RENDERER string problem (Andreas Stenglein) 2004-01-17 16:05:40 +00:00
Brian Paul
edc9ffc748 bump version to 6.1 (new development) 2004-01-16 21:26:30 +00:00
Keith Whitwell
4a53f7bc74 Respect the 'in_use' field in the global LRU as a marker for
kernel-reserved memory regions.
2004-01-16 13:41:18 +00:00
Daniel Borca
48e89df25b fixed refresh rate control in Glide wrapper 2004-01-16 06:59:50 +00:00
Brian Paul
546214f3c8 tweaks for 6.0 release 2004-01-15 15:47:57 +00:00
Karl Schultz
46d6bd368d add casts to quiet compiler warnings 2004-01-15 15:43:07 +00:00
Brian Paul
6290ca42f2 fix -fomit-frame_pointer typo 2004-01-15 14:24:37 +00:00
Daniel Borca
f8761dc040 implemented glutTimerFunc 2004-01-15 08:30:05 +00:00
Daniel Borca
0849ed1275 documentation update 2004-01-15 07:17:31 +00:00
Daniel Borca
4d5e6623d3 _mesa_delete_texture_object and some other updates 2004-01-15 07:16:06 +00:00
Brian Paul
3663c0f825 Cosmetic changes.
Added a bunch of const qualifiers.
Use _mesa_memcpy() instead of memcpy(), etc.
2004-01-15 00:29:51 +00:00
Brian Paul
5bae6b90f9 change MALLOC to CALLOC to silence valgrind error in _playback_copy_to_current() 2004-01-15 00:09:01 +00:00
Brian Paul
4b603440f6 use -G not -shared for gcc on SunOS 2004-01-14 23:18:47 +00:00
Brian Paul
ae7666385d added blurb about NVIDIA extensions 2004-01-14 19:51:19 +00:00
Brian Paul
e6089db8c0 latest changes, bug fixes 2004-01-14 19:49:22 +00:00
Brian Paul
8533b91543 bump MAX_WIDTH/HEIGHT to 4K pixels 2004-01-14 19:48:58 +00:00
Karl Schultz
d48382c778 Generate mesa.def file for Windows. 2004-01-14 17:45:24 +00:00
Karl Schultz
c85f0fa177 Replace with version generated from new python script. 2004-01-14 17:38:14 +00:00
Keith Whitwell
eb7935c63b Fix up more confusions with count vs end in array functions 2004-01-14 10:52:51 +00:00
Daniel Borca
43ed92b3a1 fixed a bug in texture memory manager when in UMA mode 2004-01-14 07:10:12 +00:00
Michel Dänzer
067603db91 Fix initialisation of cubic tecture offsets (Andreas Stenglein) 2004-01-14 02:26:28 +00:00
Karl Schultz
5da27de003 add new entrypoints 2004-01-13 23:45:42 +00:00
Brian Paul
0ce75a77c0 tweak aix-gcc config 2004-01-13 23:39:34 +00:00
Ian Romanick
e54f260170 Added support for EXT_texture_mirror_clamp. 2004-01-13 16:21:06 +00:00
Brian Paul
b44d4a0d6a updated glext.h, fixed bug 876160 2004-01-13 16:18:33 +00:00
Brian Paul
a7e6f7ba35 exercise glDeleteProgramsARB 2004-01-13 16:17:21 +00:00
Brian Paul
7a28156666 glDeleteProgramsARB() failed for fragment programs (bug 876160) 2004-01-13 16:14:09 +00:00
Jouk Jansen
1e274517b8 Committing in .
optional compilation of progs/test/ since it seems not to appear in the
 releases.

 Modified Files:
 	Mesa/descrip.mms
 ----------------------------------------------------------------------
2004-01-13 16:04:46 +00:00
Daniel Borca
09a4fcb592 added support for textures bigger than HW can support (SW rescaling) 2004-01-13 08:47:44 +00:00
Daniel Borca
b005b8258d re-enabled trilinearness 2004-01-13 08:46:46 +00:00
Daniel Borca
d075366107 small fixes 2004-01-13 08:46:12 +00:00
Daniel Borca
66304ec6d1 updated FX wrapper 2004-01-13 08:24:43 +00:00
Ian Romanick
eba6bacc88 Removed some dead code. R128 does not (as far as I can tell) support
GL_ARB_texture_border_clamp.  The ATI drivers for Windows support it,
but I can see no way to make it work without a fallback.
2004-01-13 02:18:58 +00:00
Ian Romanick
3d8f7d4c8c Added some missing extension strings. 2004-01-13 02:15:29 +00:00
Brian Paul
cdde03efe2 remove stuff that's now in glext.h 2004-01-13 02:04:57 +00:00
Brian Paul
c661cccf37 updated to version 21 with OpenGL 1.5 support 2004-01-13 01:54:03 +00:00
Karl Schultz
c6c4cd8b6f silence compiler warnings 2004-01-13 01:11:09 +00:00
Karl Schultz
4f7a8f3a47 remove unused variable 2004-01-13 01:10:05 +00:00
Karl Schultz
1852f4fa33 change type of loop index var to remove compiler warning. 2004-01-13 01:09:17 +00:00
Karl Schultz
d575248903 add cast to quiet compiler warning 2004-01-13 01:08:23 +00:00
Karl Schultz
1c5a45eafe init an uninitialized variable. This doesn't fix a latent bug because
the variable was multiplied by zero.
2004-01-13 01:07:28 +00:00
Karl Schultz
9bb7a55de9 add casts to silence compiler warnings 2004-01-13 01:05:28 +00:00
Karl Schultz
d612d7e2ee add t_vertex.c to project 2004-01-13 00:24:03 +00:00
Karl Schultz
22e68de957 remove ss_vb.c from project 2004-01-13 00:23:31 +00:00
Keith Whitwell
8bec7c09bb Don't call _tnl_draw_range_elements() unless start == 0. 2004-01-12 23:21:54 +00:00
Ian Romanick
553a8e0e7b Removed redundant extension strings. The Mesa extension mechanism
automatically enables "duplicate" extensions without the driver
explicitly enabling them.
2004-01-12 22:50:01 +00:00
Brian Paul
e96d5b9846 latest bug fixes 2004-01-12 15:30:55 +00:00
Brian Paul
f7650b647a added note about mklib permissions 2004-01-12 15:30:42 +00:00
Brian Paul
a62bccff67 make executable 2004-01-12 14:52:21 +00:00
Daniel Borca
1b65e52fb1 Glide driver (windowed mode) fix for Voodoo2 2004-01-12 12:28:05 +00:00
Brian Paul
bf30122484 comment-out the touch/rm depend lines 2004-01-11 17:15:03 +00:00
Brian Paul
ebe0ca3937 change -O to -O2 for aix-gcc 2004-01-11 17:14:37 +00:00
Brian Paul
b673fc49b9 fix vertex program debugger issues (Bug 874382) 2004-01-11 16:48:14 +00:00
Brian Paul
8bc3ce92a2 call _mesa_delete_texture_object() from in the driver's DeleteTexture function 2004-01-11 16:27:53 +00:00
Brian Paul
add9f2168a add GL_TEXTURE_CUBE_MAP_ARB to _mesa_max_texture_levels(), reordered some comments 2004-01-11 16:21:13 +00:00
Michel Dänzer
4dd4ac3fc0 Actually disable HW TCL capability when SW TCL is forced.
+ remove some gratuitous whitespace
2004-01-11 13:10:08 +00:00
Brian Paul
b07430817c more aix-gcc tweaking 2004-01-11 00:05:34 +00:00
Brian Paul
da93ecd3ec aix-gcc tweaks 2004-01-10 22:42:34 +00:00
Brian Paul
e3cc5c31b9 removed MAKELIB lines. tweak openbsd config 2004-01-10 22:22:41 +00:00
Brian Paul
ff3515831e added OSMESA_LIB_DEPS needed for some platforms 2004-01-10 22:18:41 +00:00
Brian Paul
ae6c594908 added aix-gcc config 2004-01-10 22:14:51 +00:00
Brian Paul
12d6caea08 Use same steps for Linux and OpenBSD.
Added AIX/gcc support.
2004-01-10 22:12:21 +00:00
Brian Paul
cf75101bba regenerated to support new 1.5 functions, etc. 2004-01-09 20:34:04 +00:00
Brian Paul
bd09d49eb4 re-enable SSE code, except for the _mesa_sse_transform_points4_identity() function. Use the x86 version instead 2004-01-09 17:14:22 +00:00
Brian Paul
ed98b867af Change < to <= when testing counts against ctx->Const.MaxArrayLockSize,
per Daniel Borca.
Also, added XXX comments to mark where there may be a problem with the
calls to _tnl_vb_bind_arrays().  Is the last parameter a count or index?
2004-01-09 15:31:08 +00:00
Keith Whitwell
a05b1549f7 Roland Scheidegger's r200_changeemitorder.diff. 2004-01-09 09:28:40 +00:00
Felix Kuehling
0f47e002bc Fixed a few typos in the german translation. 2004-01-08 22:49:26 +00:00
Brian Paul
088eb4fb9b set StringPos field in parse_vp_instruction (Mesa bug 873011) 2004-01-08 14:23:42 +00:00
Jouk Jansen
332a6741d5 Committing in .
Update OpenVMS makefiles

 Modified Files:
 	Mesa/src/mesa/swrast_setup/descrip.mms
 	Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-01-08 14:14:02 +00:00
Keith Whitwell
fb2a95b391 Perform check for dstclip[3] == 0. 2004-01-08 13:55:24 +00:00
Daniel Borca
2fa774edba keeping things safe: sanity check back 2004-01-08 09:04:27 +00:00
Daniel Borca
a71d4445b4 envvars to control run-time 2004-01-08 07:37:21 +00:00
Daniel Borca
1a2a1f039d updated makefiles 2004-01-08 07:36:37 +00:00
Daniel Borca
d994f6dda5 removed unnecessary (now) sanity check 2004-01-08 07:32:06 +00:00
Felix Kuehling
94de418fd0 Use hand-made number parsing functions as the libc routines are locale-dependent. Thanks to Pavel harry_x Palat for pointing that out. 2004-01-07 23:35:00 +00:00
Brian Paul
49bef526fd reindent the code 2004-01-07 15:18:17 +00:00
Brian Paul
d7af11a041 updates for 6.0 release 2004-01-07 14:51:30 +00:00
Daniel Borca
731852f8a1 bugfix in texture swapping mechanism (multitex) 2004-01-07 13:58:04 +00:00
Daniel Borca
6471160770 temporary workaround for bad primitives in fx_render_vb_quads 2004-01-07 13:57:23 +00:00
Daniel Borca
4c75d90ad2 protect against broken apps 2004-01-07 13:54:17 +00:00
Daniel Borca
63f025c5ad teensy bit of optimization in interp code 2004-01-07 12:50:30 +00:00
Daniel Borca
e1ecdc337e wgl interface 2004-01-07 12:49:47 +00:00
Daniel Borca
972f3ccedf cleanups 2004-01-07 12:49:22 +00:00
Daniel Borca
17f2e55009 sanity check for vertex counter 2004-01-07 12:39:45 +00:00
Daniel Borca
722cb89a13 no-op table on par with main dispatcher 2004-01-07 12:37:09 +00:00
Daniel Borca
ff1c766f7c Mingw3 prototypes 2004-01-07 12:34:28 +00:00
Keith Whitwell
203dca4287 Testing 2004-01-06 20:13:41 +00:00
Brian Paul
a48a280e27 added Aqsis link 2004-01-06 16:36:48 +00:00
Brian Paul
b4b04651f5 remove BMRT link 2004-01-06 15:33:48 +00:00
Keith Whitwell
85138fa443 Add comment regarding sse disable 2004-01-06 12:20:20 +00:00
Keith Whitwell
20caac0967 SSE segfaults in conform - disable for now. 2004-01-06 12:19:40 +00:00
Keith Whitwell
38bf45d4bb Fixes for _swsetup_Translate() 2004-01-06 00:18:23 +00:00
Keith Whitwell
44d4a8f645 Apply attribute offset when calling extract().
Simplify stride calcs.
2004-01-06 00:18:03 +00:00
Eric Anholt
10095c9024 Add support for Radeon IGP chipsets, based off of mcgrof-radeon-igp-v3.diff
XFree86 bug:	314
2004-01-05 23:19:21 +00:00
Brian Paul
283507075a added missing descrip.mms files to tar file list 2004-01-05 16:42:34 +00:00
Keith Whitwell
16f54219f5 Slight cleanup 2004-01-05 15:55:01 +00:00
Keith Whitwell
fc9f313b9d Remove debug 2004-01-05 15:31:22 +00:00
Keith Whitwell
588225770c Beef up t_vertex.c:
- cope with input vectors with size less than that of the emitted
	  attribute.
	- cope with vertices with 'holes' inside and between vertices.

Fix calculation of tnl->render_inputs to work with fp programs.
Mirror VB->PointSizePtr in VB->AttribPtr so that it can work with t_vertex.c.

Transition swrast_setup/ to use t_vertex.c to build swrast vertices.
2004-01-05 15:24:53 +00:00
Keith Whitwell
ce81fe69da Add t_vertex.c 2004-01-05 10:06:49 +00:00
Keith Whitwell
790734045b Re-commit t_vertex.[ch] changes to fd.o server. 2004-01-05 09:43:42 +00:00
Felix Kuehling
effc73931f Added def_max_anisotropy and no_neg_lod_bias options to radeon and r200.
The def_max_anisotropy option breaks driconf. :( I'm going to upload a
fixed version soon.
2004-01-05 02:40:28 +00:00
Felix Kuehling
dbfe7ae848 Added two new options: def_max_anisotropy and no_neg_lod_bias. The latter one
is for disabling faked "anisotropy" in e.g. FlightGear.
2004-01-05 02:35:45 +00:00
Felix Kuehling
22d1acf2ee New, less expensive workaround for state-change lockups. 2004-01-04 22:08:31 +00:00
Felix Kuehling
9741dd6cf4 Reenable the vtxfmt code paths in the radeon and r200 drivers. 2004-01-04 16:39:29 +00:00
Brian Paul
41c310b20a whitespace changes and new comments 2004-01-01 17:13:12 +00:00
Brian Paul
4d1b773dd3 latest updates 2004-01-01 15:18:50 +00:00
Brian Paul
d7a3b7e27b added -fPIC -fomit-frame-pointer etc to sunos5-gcc configs (bug 868737) 2004-01-01 15:17:20 +00:00
Brian Paul
fc528e27c6 added info about S3TC texture compression 2003-12-31 20:59:51 +00:00
Brian Paul
1fdfd54ba2 updated CVS info 2003-12-31 20:47:37 +00:00
Felix Kuehling
2788927410 Fix TCL_LIGHT_MODEL_CTL setting in radeonColorMaterial. 2003-12-28 15:07:38 +00:00
Keith Whitwell
7a57932a02 Don't allow lighting in model coordinates when fog is active,
from radeon_state.c, noticed by Dieter Nuetzel.
2003-12-27 22:06:39 +00:00
Keith Whitwell
eff4abcbd8 Correct sense of ctx->_ForceEyeCoords (Felix Kuhling) 2003-12-27 20:03:26 +00:00
Brian Paul
f903e1142d the optimized UNCLAMPED_FLOAT_TO_UBYTE macro was broken 2003-12-23 21:43:54 +00:00
Daniel Borca
0ee5f6203c reverted TMUs for proper multitexturing 2003-12-23 14:11:22 +00:00
Keith Whitwell
fabb9734dd new files 2003-12-21 17:54:31 +00:00
Brian Paul
259b880bc7 Version bumps, etc for Mesa 6.0 2003-12-21 04:06:31 +00:00
Daniel Borca
e9e98405e7 DMesa: removed MGA2064W driver
DMesa: added capability to query visuals
fxMesa: WGL_3DFX_gamma_control
fxMesa: minor fixes to interface (fxQueryHardware vs fxMesaSelect...)
2003-12-19 11:26:46 +00:00
Brian Paul
eee77bf82f added link to RELNOTES-5.1 2003-12-18 00:42:16 +00:00
Brian Paul
9ccc84160b added MD5 checksums for 5.1 tarballs 2003-12-18 00:32:05 +00:00
Brian Paul
ede655c230 updates for 5.1 release 2003-12-17 23:54:23 +00:00
Ian Romanick
63a5cbb177 Fix to work with the C preprocessor in GCC 3.3.x. 2003-12-17 21:35:44 +00:00
Brian Paul
829adaee79 updated location of config.h 2003-12-17 15:14:31 +00:00
Brian Paul
65aeac065c s/Makefile.X11/Makefile.solo/ for make clean 2003-12-17 15:11:41 +00:00
Brian Paul
63f4e198b4 fix GL_MIN/MAX w/ glBlendFuncSeparate bug (Ian Romanick) 2003-12-15 18:04:17 +00:00
Brian Paul
b3b725b1e6 Assorted mklib tweaks.
Added Intel icc support to mklib.
2003-12-15 16:14:55 +00:00
Daniel Borca
f80220d050 EXT_secondary_color and EXT_separate_specular via multipass 2003-12-15 10:38:12 +00:00
Karl Rasche
7aa77b679d Problem computing specular value in OPCODE_LIT - pulled in value from
vertex program execution of LIT
2003-12-13 15:12:58 +00:00
Brian Paul
79ce209553 fixed bad touch command 2003-12-13 01:58:41 +00:00
Brian Paul
82e9f0099d fix some matypes.h glitches 2003-12-13 01:58:20 +00:00
Brian Paul
3c7b7df6d5 call _ae_destroy_context() and _ae_invalidate_state() from the proper places 2003-12-13 01:55:49 +00:00
Brian Paul
c360a721e7 init vars to silence warnings 2003-12-13 01:35:33 +00:00
Brian Paul
e39e7bc17c added BeOS files, src/mesa/sources file 2003-12-13 01:33:36 +00:00
Brian Paul
50f20ec7f5 Updates from Philippe Houdoin. 2003-12-13 01:26:14 +00:00
Alan Hourihane
3b81ccd826 fix for C++ 2003-12-12 22:35:02 +00:00
Brian Paul
74466be8cb check swrast->NewState in Draw/CopyPixels functions 2003-12-12 20:19:13 +00:00
Brian Paul
4a3110fb21 remove TexCoordInterleaveFactor. Clean up _mesa_InterleavedArrays() 2003-12-12 18:40:02 +00:00
Brian Paul
d450d0b0e2 applied Felix's patch for configuration system 2003-12-12 16:38:57 +00:00
Karl Rasche
177db2bc9b - Test instruction count
- Throw an error for VPs if we set position invariance and then write to the output position
2003-12-12 16:30:15 +00:00
Brian Paul
d7a2a7f4a8 updated list of files 2003-12-12 15:44:11 +00:00
Brian Paul
9cefb392bc uncomment-out tdfx driver 2003-12-12 15:39:30 +00:00
Brian Paul
520ef4b5bc new makefiles 2003-12-12 15:33:51 +00:00
Brian Paul
c882e19643 makefile improvements 2003-12-12 15:32:25 +00:00
Brian Paul
ecc150c626 improved makefiles 2003-12-12 15:31:50 +00:00
Brian Paul
107564b090 lists of common source files 2003-12-12 15:31:17 +00:00
Brian Paul
b8cbca4807 new Makefiles 2003-12-12 15:30:52 +00:00
Keith Whitwell
013056ac65 set MaxTextureImageUnits, MaxTextureCoordUnits 2003-12-12 10:06:02 +00:00
Daniel Borca
e01d671668 small bug wrt culling 2003-12-12 08:19:20 +00:00
Brian Paul
379641956d fix visinfo typo 2003-12-12 00:08:01 +00:00
Brian Paul
a9a1c3f20f check for null dpy in Fake_glXGetConfig() 2003-12-12 00:01:17 +00:00
Brian Paul
c3fb2558f0 replace gl/mesa_wgl.h with GL/mesa_wgl.h (Simon Goodall) 2003-12-11 23:55:55 +00:00
Keith Whitwell
d8be4a54fa Don't evaluate GET_CURRENT_VB_MAX_VERTS() until after calling INIT() 2003-12-11 20:49:59 +00:00
Keith Whitwell
7ed58285ab add driClipRectToFramebuffer helper function 2003-12-11 19:06:32 +00:00
Keith Whitwell
844cdaf461 Updates to tnl_dd_dmatmp.h
- Allocate vertices explicitly, rather than trying to talk
	  about dma buffers.
	- Clean up the various Flush() operations.
	- Don't allow fallbacks any longer.  Provide a support function
	  to detect them ahead o ftime
Updates to tnl_dd_vbtmp.h
	- Get rid of power-of-two vertex strides.  Pack all vertices tightly.
	- Get texunit 2,3 emit working coorrectly.
Other stuff:
	- Get rid of lingering Ubyte color support.
	- Fix a few compiler warnings.
2003-12-11 16:49:55 +00:00
Keith Whitwell
2dc621f3fd Updates to tnl_dd_dmatmp.h
- Allocate vertices explicitly, rather than trying to talk
	  about dma buffers.
	- Clean up the various Flush() operations.
	- Don't allow fallbacks any longer.  Provide a support function
	  to detect them ahead o ftime
Updates to tnl_dd_vbtmp.h
	- Get rid of power-of-two vertex strides.  Pack all vertices tightly.
	- Get texunit 2,3 emit working coorrectly.
Other stuff:
	- Get rid of lingering Ubyte color support.
	- Fix a few compiler warnings.
2003-12-11 16:25:36 +00:00
Daniel Borca
5bcf52b4d6 fixed prototypes for wglGammaRamp3DFX 2003-12-11 16:16:33 +00:00
Keith Whitwell
e0ee87422b Quash annoying compiler warning 2003-12-11 15:47:43 +00:00
Keith Whitwell
a9fc4b1b1c Remove dead file glcore-new.h 2003-12-11 13:10:20 +00:00
Alan Hourihane
2ed4797848 fix from DRI trunk 2003-12-10 19:12:49 +00:00
Daniel Borca
2844285297 got rid of __FUNCTION__ :(
Texus2 functions are dynamically linked now
made getRegistryOrEnvironmentString more portable
bugfix: unnecessary total SW fallback -- glColorMask
bugfix: when shared palette was not loaded correctly
point_attenuation_stage back in business (point size/atten)
fxTexGetInfo is not required for fxIsTexSupported
fxDDChooseTextureFormat optimized for RGB/RGBA textures
accelerated Quads with Triangle_Fans
more WGL extensions/functions (also updated export file)
DXTC/S3TC -> FXT1 wrapping hack
quick & dirty fix for Quake2
2003-12-10 15:24:49 +00:00
Alan Hourihane
43be8ee414 fix typo 2003-12-10 14:10:45 +00:00
Brian Paul
13861dbff9 added fbdev/glfbdev.c to tarball list 2003-12-10 02:44:38 +00:00
Eric Anholt
527078afca Fix definitions for Intel compiler.
Submitted by:	Mikhail Teterin <mi@FreeBSD.org>
2003-12-09 23:59:16 +00:00
Keith Whitwell
b44fb35770 In fact, bring all the changes from mesa/tnl_dd to mesa/drivers/common. 2003-12-09 19:35:45 +00:00
Keith Whitwell
10637fed22 Remove old ubyte-color support code. Update interp, copy_pv for float
colors in VB arrays.
2003-12-09 19:30:22 +00:00
Karl Rasche
2e5ec27845 Arg. I can't code.. Test that we don't recongnize '0' as having a leading zero.. 2003-12-09 19:14:41 +00:00
Karl Rasche
a8a4ad452e added parsing exercises for ARL and relative offsets in ARB_vp 2003-12-09 18:17:04 +00:00
Karl Rasche
ff10a796fe - New grammar (0.5) from Michal Krol, merges many opcodes and adds range testing
- Proper header on arbparse_syn.h
 - Handling of relative offsets for ARB_vp
 - s/MaxFragment/MaxVertex
 - Check for leading 0's in the fraction portions of floats in parse_float()
2003-12-09 18:13:12 +00:00
Karl Rasche
057dfcb06c - handle IsPositionInvariant
- tweak assertion to allow for relative offets from ARB_vp
2003-12-09 18:04:52 +00:00
Keith Whitwell
82efdff66f Fix typo. 2003-12-09 16:22:33 +00:00
Keith Whitwell
8069ada29b MGA only has one vertex format. 2003-12-09 16:21:31 +00:00
Keith Whitwell
9556a52867 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:14:24 +00:00
Keith Whitwell
425deefdd0 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:09:24 +00:00
Keith Whitwell
8592ba94b8 Fix use of uninited value 'flags', removed unused vars. 2003-12-09 16:02:43 +00:00
Keith Whitwell
c4f7de5d78 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:00:38 +00:00
Keith Whitwell
4790914198 Fix incorrect removal of PRIM_PARITY code (ie remove the parity code, not the
non-parity code).
2003-12-09 15:33:45 +00:00
Keith Whitwell
6881938007 Call UpdateMaterials when they have changed 2003-12-09 14:19:41 +00:00
Keith Whitwell
a70fa7129c clean up some compiler warnings 2003-12-09 14:18:41 +00:00
Keith Whitwell
8a340279f4 No need to call UpdateMaterial() from RunPipeline(). 2003-12-09 14:18:18 +00:00
Keith Whitwell
e6abd5c415 No need to call radeonUpdateMaterial() from RunPipeline(). 2003-12-09 14:17:40 +00:00
Keith Whitwell
48383f10c9 Remove $Id tag 2003-12-09 11:54:50 +00:00
Jouk Jansen
7ac9133627 Committing in .
Small VMS issue : sys/param.h is not available on all systems and not
                   needed anyway.

 Modified Files:
 	Mesa-newtree/src/mesa/main/vsnprintf.c
 ----------------------------------------------------------------------
2003-12-09 10:11:27 +00:00
Brian Paul
853bda3e7c Update NEED_SECONDARY_COLOR macro to test if either vertex/fragment
programs are enabled and if they need secondary color input register.
Patch by Karl Rasche, with tweaks by Brian.
2003-12-09 01:53:03 +00:00
Eric Anholt
e8bec8832b Remove usleeps from sis driver. We probably aren't doing anyone a service
sleeping with the lock held.  Also, rename cEngineState to engineState since
it isn't a char any more.
2003-12-09 00:00:40 +00:00
Alan Hourihane
73c3c397e4 fix bogus assertion that checked for an empty texture heap list before
deleting the textures. Essentially move the assertion after the destruction
of the heap.
2003-12-08 22:43:10 +00:00
Karl Rasche
93c2dacca6 A quick little test to show disapeearing specular color between vertex and fragment program execution 2003-12-08 21:43:55 +00:00
Keith Whitwell
6b9e8279dd Provide dummy definitions of __driConfig externs 2003-12-08 17:32:58 +00:00
Alan Hourihane
f7c17fef74 turn on tdfx in SOLO build 2003-12-08 17:27:33 +00:00
Alan Hourihane
1cb5d2e01a some changes for SOLO build 2003-12-08 17:26:59 +00:00
Alan Hourihane
8ed3231669 build in SOLO environment 2003-12-08 17:14:47 +00:00
Alan Hourihane
243093f544 kill a warning 2003-12-08 17:07:41 +00:00
Alan Hourihane
18343db1d8 reverse Keith's 'XFree86Server' glue. 2003-12-08 16:57:21 +00:00
Keith Whitwell
3abad78e26 Can't include <stddef.h> when building XFree86 server - define
ptrdiff_t to int instead
2003-12-08 15:00:24 +00:00
Keith Whitwell
07851ca039 get ffb compiling 2003-12-08 13:33:07 +00:00
Keith Whitwell
c11039979c get tdfx compiling 2003-12-08 13:21:22 +00:00
Daniel Borca
8fee8dfcaa fixed a bug in texgen (T coord for GL_REFLECTION_MAP_NV) 2003-12-08 13:00:50 +00:00
Keith Whitwell
034da5d817 Remove PRIM_PARITY reference 2003-12-08 12:32:50 +00:00
Jouk Jansen
58f88a29d2 Committing in .
OpenVMS compile issues

 Modified Files:
 	Mesa-newtree/progs/tests/cva.c
 	Mesa-newtree/progs/tests/dinoshade.c
 	Mesa-newtree/progs/tests/multipal.c
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 	Mesa-newtree/src/mesa/tnl/t_vtx_api.c
 ----------------------------------------------------------------------
2003-12-08 09:03:35 +00:00
Jouk Jansen
2799d2535a Committing in .
Solves array boundary out of bound which causes problems on OpenVMS (and
   maybe other systems)

 Modified Files:
 	Mesa-newtree/src/mesa/tnl/t_vb_lighttmp.h
 	Mesa-newtree/src/mesa/tnl/t_vtx_eval.c
 ----------------------------------------------------------------------
2003-12-08 08:58:52 +00:00
Alan Hourihane
173f9ae031 add SETPARAM ioctl 2003-12-08 00:43:34 +00:00
Alan Hourihane
99ef0a0329 merge some more of the radeon DRI driver from the DRI trunk 2003-12-07 23:53:32 +00:00
Alan Hourihane
273e52f86f sync some more of the r200 driver from the DRI trunk 2003-12-07 23:47:56 +00:00
Alan Hourihane
297807d431 merge i830 DRI driver from DRI trunk 2003-12-07 23:40:13 +00:00
Brian Paul
a5a7d208c4 added drivers/fbdev/glfbdev.c 2003-12-06 17:59:08 +00:00
Brian Paul
8172cec943 conditionally define GLAPIENTRYP to prevent some warnings in linux-solo 2003-12-06 17:58:30 +00:00
Brian Paul
1a644b333c tweaks for SunOS 2003-12-06 17:57:12 +00:00
Brian Paul
99cfc4ecbc Basic info about the glFBDev interface/driver. 2003-12-06 17:26:50 +00:00
Brian Paul
a763123b35 glFBDev driver from embedded-2 branch.
Probably won't be actively used/maintained, but bring it to the trunk so
it doesn't get lost.
2003-12-06 17:20:10 +00:00
Brian Paul
fde2b9750e basic API work for FBConfigs & Pbuffers 2003-12-06 17:17:42 +00:00
Keith Whitwell
fe54ba3952 Relax assertion to account for empty primitives. 2003-12-06 12:58:47 +00:00
Brian Paul
78c5841364 s/APIENTRY/GLAPIENTRY/ for 1.5 functions 2003-12-06 01:49:54 +00:00
Alan Hourihane
cc14011596 fix _SOLO build problem 2003-12-05 22:35:57 +00:00
Alan Hourihane
87ae8db374 fix a _SOLO build problem 2003-12-05 22:34:11 +00:00
Alan Hourihane
e616ad78d8 fix _SOLO build problem 2003-12-05 22:26:35 +00:00
Alan Hourihane
e412eef73f fix some _SOLO build problems 2003-12-05 22:24:31 +00:00
Alan Hourihane
d907a75498 xmlconfig fixes 2003-12-05 22:12:07 +00:00
Alan Hourihane
e4b5ff8e77 xmlconfig fixes for the new options 2003-12-05 22:11:15 +00:00
Alan Hourihane
94965f2738 merge r128 DRI driver from DRI trunk 2003-12-05 11:51:39 +00:00
Alan Hourihane
98165fb1cf merge i810 DRI driver from DRI trunk 2003-12-05 11:47:35 +00:00
Alan Hourihane
a87bf1599c fix compiler warning 2003-12-05 11:25:15 +00:00
Alan Hourihane
c0b0b1790a remove duplicate declarations 2003-12-05 11:22:07 +00:00
Keith Whitwell
fcf02034b4 Backout last change on the displaylist path to fix gears (and probably
everything else).
2003-12-05 08:57:25 +00:00
Brian Paul
b25439a3bc include glheader.h first, to prevent warnings about GLAPIENTRYP being redefined 2003-12-05 00:48:37 +00:00
Brian Paul
dd7f735f53 don't include GL/gl.h, define GLAPIENTRYP if not defined 2003-12-05 00:46:06 +00:00
Brian Paul
a6ad01c14e Fix a front/back CopyPixels glitch. 2003-12-05 00:44:01 +00:00
Brian Paul
15f7f4e31f press f key to toggle front/back drawing/copying 2003-12-05 00:39:48 +00:00
Alan Hourihane
eed5ac284c bring over latest mga DRI driver from DRI trunk 2003-12-05 00:32:15 +00:00
Alan Hourihane
1f2d9ae69f bring in common from DRI trunk 2003-12-05 00:19:32 +00:00
Alan Hourihane
0cbb006942 disable some DEBUG 2003-12-04 23:24:12 +00:00
Karl Schultz
f9b0ac691c Windows needs to #define GL_GLEXT_PROTOTYPES 2003-12-04 21:03:08 +00:00
Karl Schultz
9b9a57a25c Change
#define GLAPIENTRYP __stdcall *
to
#define GLAPIENTRYP GLAPIENTRY *
These two defs end up doing the same thing, but the compiler can squawk
because they look different.  Also matches the way it is declared in gl.h.
Do same for GLCALLBACKP.
2003-12-04 20:55:58 +00:00
Karl Schultz
fed1cda2ad update files 2003-12-04 20:44:49 +00:00
Karl Schultz
44c00033f2 Add missing GLAPIENTRY 2003-12-04 20:43:24 +00:00
Karl Schultz
d6745697b6 Add missing GLAPIENTRY 2003-12-04 20:23:44 +00:00
Alan Hourihane
ddd3fad6e5 use _swrast_CopyPixels for XFree86 2003-12-04 20:10:54 +00:00
Alan Hourihane
e78dd78e4a merge latest DRI sis driver changes from the DRI trunk 2003-12-04 18:17:32 +00:00
Alan Hourihane
ecb1a5f7f9 build fix 2003-12-04 16:58:29 +00:00
Alan Hourihane
21a218f5bf build fixes 2003-12-04 16:57:43 +00:00
Alan Hourihane
164c703e98 build fixes 2003-12-04 16:38:05 +00:00
Alan Hourihane
4abac931e8 build fixes 2003-12-04 16:07:17 +00:00
Alan Hourihane
faf4059aa8 check if GLAPIENTRYP is already set 2003-12-04 15:59:41 +00:00
Alan Hourihane
f82c775fff #define GLAPIENTRYP GLAPIENTRY * 2003-12-04 15:59:03 +00:00
Brian Paul
1d7b75c3ad don't use new glDrawPixel routines in Xserver 2003-12-04 15:29:10 +00:00
Alan Hourihane
8ea178d68f remove duplicate declaration 2003-12-04 14:30:53 +00:00
Alan Hourihane
b97faf113d build fixes 2003-12-04 14:04:35 +00:00
Alan Hourihane
4e638426fd build fix 2003-12-04 14:00:56 +00:00
Alan Hourihane
84f6b5206f build fixes 2003-12-04 13:40:28 +00:00
Alan Hourihane
13e6a4849c add SPARC ffb DRI driver 2003-12-04 13:38:06 +00:00
Alan Hourihane
15af25aca0 build fixes 2003-12-04 13:28:10 +00:00
Alan Hourihane
e05ab2795b add tdfx DRI driver 2003-12-04 13:27:05 +00:00
Alan Hourihane
3eb58b4c1e bring over glcore.h changes from DRI trunk 2003-12-04 12:33:15 +00:00
Brian Paul
b305028464 Port over changes from XFree86/Mesa 5.0.2, mostly to silence compiler warnings. 2003-12-04 03:19:46 +00:00
Brian Paul
03e29a5f77 Fix some problems with glDrawElements and vertex buffer objects. 2003-12-04 03:16:27 +00:00
Keith Whitwell
6ff60049a4 Ensure PRIM_BEGIN marker isn't lost when incomplete primitives are wrapped. 2003-12-03 10:15:17 +00:00
Karl Rasche
9b0dcfd408 s/inverse/invtrans.. whoopsie 2003-12-02 22:46:30 +00:00
Karl Rasche
ce0f8fef86 Remove things having to do with ARB_matrix_palette/ARB_vertex_blend 2003-12-02 22:41:45 +00:00
Brian Paul
80e89c5368 added description of faster glDraw/CopyPixels code 2003-12-01 22:43:31 +00:00
Brian Paul
9a90cd40c6 fix __sparc_v9__ test to exclude linux (bug 852204) 2003-12-01 22:40:26 +00:00
Brian Paul
06cfb44564 updated list of files since merging vtx branch 2003-12-01 22:33:07 +00:00
Brian Paul
870a9acd02 s/texUnit->Enabled/enableBits/ (Karl Rasche) 2003-11-30 19:55:13 +00:00
Karl Rasche
1df1547f9e Fixed compiler warnings
Assign the correct thing to TexturesUsed[]
2003-11-30 15:59:28 +00:00
Brian Paul
de0dd65aee Use XPutImage() for glDrawPixels() and XCopyArea() for glCopyPixels() when
possible (when pixel formats match and drawing to front buffer with no
raster operations).
Results in 10-100x speed-up when applicable.
2003-11-29 19:36:08 +00:00
Brian Paul
e90de7883a Fix generic/conventional vertex array glitches.
Changed _NEW_ARRAY_ATTRIB_0 back to 0x10000 so that the conventional and
generic enable bits do not alias.
In ac_import.c test Array.Normal.Enabled instead of Array._Enabled & _NEW_ARRAY_COLOR0, etc.
In t_array_import.c give priority for generic arrays over conventional
arrays on an individual basis, not all or none.
2003-11-29 19:33:33 +00:00
Brian Paul
afb6fe034c more tweaks to error checking and reporting 2003-11-28 21:06:40 +00:00
Brian Paul
deb4a63a86 if id==0 in glGetQueryObject, raise GL_INVALID_OPERATION 2003-11-28 20:30:36 +00:00
Brian Paul
c99e2dd1d3 fix an error test 2003-11-28 18:18:50 +00:00
Brian Paul
ba9dc7ecf3 updated NetReality -> Pansophica 2003-11-28 15:06:02 +00:00
Keith Whitwell
326bc7150d Save and restore front colors on backfacing triangles rather than trying to
pull them again from the VB pointers.  Avoids stride issues.
2003-11-28 09:43:18 +00:00
Brian Paul
acbc1e0c91 added link to Chromium 2003-11-26 18:10:31 +00:00
Brian Paul
69449a9d51 updated CVS info 2003-11-26 18:10:19 +00:00
Daniel Borca
854b4a3b54 accomodate vtx-0-2-branch 2003-11-26 08:32:35 +00:00
Brian Paul
0f3cd3f894 current raster color index should be GLfloat 2003-11-25 22:45:59 +00:00
Brian Paul
7df4f95314 added SoftGL link 2003-11-25 21:13:26 +00:00
Brian Paul
7939ed0e8e Otto Solares' patch to add radeon 9200 2003-11-25 16:45:33 +00:00
Brian Paul
8236a534b7 fix assorted g++ warnings 2003-11-25 16:39:31 +00:00
Brian Paul
2c9f50dd4a casts for g++ 2003-11-25 16:21:51 +00:00
Brian Paul
3bc7f3f864 fix a lot of warnings found with g++ 2003-11-25 16:18:31 +00:00
Brian Paul
97d8a35fa8 silence a warning 2003-11-25 16:02:39 +00:00
Brian Paul
47b0bc1a36 remove __FUNCTION__ hack 2003-11-25 16:02:24 +00:00
Brian Paul
4ccbe9e666 added a cast 2003-11-25 16:00:25 +00:00
Brian Paul
b65bc4f87b Remove unnecessary usage of __FUNCTION__.
#define MESA_FUNCTION to __FUNCTION__ if MESA_DEBUG is defined.
2003-11-25 15:58:22 +00:00
Karl Rasche
e749be22b0 - New version of the syntax rules from Michal Krol
+ Handles '1' as a float, just like '1.'
   + Remove switch collision between vp and fp #defines
   + result.color.xyz no longer requires result.color.primary.xyz
2003-11-25 02:08:05 +00:00
Karl Rasche
9bc3753a51 added support for generic vertex attributes (ARB_vp) and their error checking 2003-11-25 00:04:36 +00:00
Brian Paul
18199d3954 updated after APIspec fixes 2003-11-24 23:14:53 +00:00
Brian Paul
2171fadc26 oops, fix glitches in 1.5 functions 2003-11-24 23:03:29 +00:00
Brian Paul
e1a107c4e7 minor cast fixes 2003-11-24 22:32:16 +00:00
Brian Paul
62b6eb320e generate the OpenGL 1.5 entrypoints 2003-11-24 22:30:32 +00:00
Brian Paul
76f51ca9ea updated list of new/old src files 2003-11-24 17:13:10 +00:00
Brian Paul
b52559eb8c set the VB->FogCoordPtr with the other legacy pointers 2003-11-24 17:00:03 +00:00
Brian Paul
c515f90ec3 fix YCBCR assertion and disable assertion in auto-mipmap code 2003-11-24 16:51:26 +00:00
Keith Whitwell
7f28ab7d24 remove dead files 2003-11-24 15:42:24 +00:00
Brian Paul
8a299e7888 whitespace and comment changes 2003-11-24 15:41:39 +00:00
Brian Paul
7e86eb991b minor error string improvement 2003-11-24 15:40:52 +00:00
Brian Paul
0dde1904c8 added GL_ARB_vertex/fragment_program and new vertex code 2003-11-24 15:39:55 +00:00
Keith Whitwell
ae0eaf93e0 Merge vtx-0-2-branch 2003-11-24 15:23:18 +00:00
Keith Whitwell
57c9814b9e Import vtx-0-2-branch 2003-11-24 15:21:14 +00:00
Keith Whitwell
5b5cf9cb8b Remove a lot of rcs tags, avoid merge conflicts 2003-11-24 15:19:27 +00:00
Karl Rasche
dda09a6154 Moving NV_fragment_program tests to ARB_fragment_program 2003-11-24 13:29:54 +00:00
Karl Rasche
79e0dad79e - parse_alias() Was totally borked
- forgot a ++ in texSrcBit switch
- copy/paste error in arbfragparse.c
2003-11-23 19:29:18 +00:00
Karl Rasche
4eebfa14e7 - Create a dummy program to keep from segfaulting when parsing
fails
	- Change to grammar .emit to fix single LOCAL/ENV param usage
2003-11-23 17:54:39 +00:00
Karl Rasche
15955f1c5e Porting NV_vertex_program demos to ARB_vertex_program 2003-11-23 17:48:15 +00:00
Karl Rasche
4814d79c99 Porting NV_vertex_program tests to ARB_vertex_program 2003-11-23 17:44:02 +00:00
Brian Paul
91b6a4aa90 include malloc.h to get ptrdiff_t for vertex buffer object's GLintptr 2003-11-23 16:22:54 +00:00
Keith Whitwell
8525fae3b8 build fixes, rh9 2003-11-23 10:27:10 +00:00
Brian Paul
67f8a1d4ad added OpenGL 1.5 tokens and functions not yet put into glext.h 2003-11-22 18:44:10 +00:00
Brian Paul
4774cd9568 pass ctx to fetch_vector4_deriv() 2003-11-22 18:29:43 +00:00
Brian Paul
96ad2cde2c GL_ARB_point_sprite is not part of 1.5 2003-11-22 18:28:21 +00:00
Daniel Borca
533733d1d4 updated core makefiles to include arbparse 2003-11-22 11:27:33 +00:00
Brian Paul
a1769b0287 fix some bugs in computation of DDX, DDY commands 2003-11-21 20:48:16 +00:00
Brian Paul
b9c5672d22 s/byte/GLubyte/ and other minor clean-ups 2003-11-21 17:07:59 +00:00
Brian Paul
6d66ba171e reformat comments for 80-column viewing 2003-11-21 16:50:03 +00:00
Brian Paul
ba254c08c0 fix a bunch of warnings 2003-11-21 16:38:56 +00:00
Daniel Borca
663a9e1b7e more texture compression 2003-11-21 09:56:50 +00:00
Jouk Jansen
8b07e9d8a4 Committing in .
- Added arbparse.c to OpenVMS makefile
   - Added 2 type casts in a strcmp call to make my compiler happy.

 Modified Files:
 	Mesa-newtree/src/mesa/main/arbparse.c
 	Mesa-newtree/src/mesa/main/descrip.mms
 ----------------------------------------------------------------------
2003-11-21 08:24:40 +00:00
Karl Rasche
a6a4257f76 Caught missing parse_color_type() [Jacob Jansen] 2003-11-21 01:22:46 +00:00
Daniel Borca
08e6fb367e texture compression testbed 2003-11-20 17:07:31 +00:00
Daniel Borca
c07cd5b99f small matters 2003-11-20 17:05:56 +00:00
Karl Rasche
00ad4e109a Initial checkin of new ARB frag/vertex program parser 2003-11-19 13:21:20 +00:00
Karl Rasche
75b5cb4317 Initial checkin of new ARB_frag/vertex program parser 2003-11-19 13:17:33 +00:00
Karl Rasche
1c27a1e957 Initial checking of new ARB_frag/vertex program parser 2003-11-19 13:15:13 +00:00
Daniel Borca
ef563d011b doc updates; GLUT timer additions; fixed compilation warnings 2003-11-18 12:18:13 +00:00
Brian Paul
aa0d6dcd65 added reference to original half/float conversion code 2003-11-18 03:44:53 +00:00
Brian Paul
10b09212e8 added missing <type> error checking in read_index_pixels() 2003-11-18 03:42:17 +00:00
Brian Paul
7eb3e9b964 Some groundwork for supporting GLhalf datatype. 2003-11-18 03:41:14 +00:00
Brian Paul
56fe4dc391 fix comments about Cr==V, Cb==U 2003-11-18 00:48:24 +00:00
Brian Paul
a4e65d69dc fix texgen bug 597589 2003-11-17 15:15:18 +00:00
Brian Paul
16c119bab2 remove GL_GLEXT_LEGACY 2003-11-13 23:09:43 +00:00
Brian Paul
0ce7d7725a added glAccum bug fix 2003-11-13 22:24:36 +00:00
Brian Paul
3a0e0b284f no-op glAccum in selection/feedback mode (per Mark Kilgard's updates to the 1.5 spec) 2003-11-13 22:16:45 +00:00
Daniel Borca
af6162e340 vanilla extensions disabled 2003-11-13 16:27:25 +00:00
Brian Paul
34a8bf5135 added Ville's RGBA blend fix 2003-11-12 15:39:13 +00:00
Brian Paul
6eb2547317 updated 5.0.2 tarballs 2003-11-12 15:32:57 +00:00
Brian Paul
57857ca092 Ville Syrjala's logic op patch 2003-11-12 15:27:52 +00:00
Daniel Borca
80ee4b1e9d dirty hack to advertise vanilla extension names 2003-11-12 11:55:21 +00:00
Brian Paul
a2b9bad251 Redo array element checking for vertex array buffers.
Now, compute ctx->Array._MaxElement as the min of enabled array's max element.
Test against ctx->Array._MaxElement in glDrawArrays/Elements.
Note: testing in glArrayElement not done yet.
Only do element checking if ctx->Const.CheckArrayBounds is set.
2003-11-10 19:08:37 +00:00
Brian Paul
5e99ad19f5 s/GGIMesaContext/ggi_mesa_context_t/ 2003-11-07 17:28:46 +00:00
Brian Paul
33267a41e0 fix comments 2003-11-07 17:28:24 +00:00
Brian Paul
666b0a3f6e added glTexSubImage3D bug 2003-11-07 14:53:17 +00:00
Brian Paul
c5853c63d0 s/xoffset/zoffset/ (Cedric Gautier) 2003-11-07 14:52:09 +00:00
Daniel Borca
d96651bdc5 NCC fixes and some cosmetics 2003-11-07 13:17:21 +00:00
Brian Paul
e83cf6ddf2 added wgl bug fix 2003-11-04 23:38:33 +00:00
Brian Paul
afa6e978b9 fix AccessViolation bug (#835861) 2003-11-04 23:37:53 +00:00
Brian Paul
f023391e1a another tweak from Matt Sealey 2003-11-03 21:59:36 +00:00
Daniel Borca
0768744fde small fixes wrt texture handling 2003-11-03 12:16:22 +00:00
Daniel Borca
ef387549bd small fixes wrt texture handling 2003-11-03 12:13:23 +00:00
Daniel Borca
313e12e058 Voodoo2 happiness 2003-11-03 12:01:03 +00:00
Daniel Borca
7093114285 accomodate decorated names 2003-11-03 12:00:24 +00:00
Daniel Borca
f807a35cd2 removed detritus 2003-10-31 11:07:39 +00:00
Daniel Borca
e81b180065 bugfixes wrt texture compression 2003-10-30 11:44:19 +00:00
Daniel Borca
63a5ca08f3 changes to accomodate texture compression 2003-10-29 14:40:43 +00:00
Daniel Borca
40bd9d0b19 texture compression 2003-10-29 14:35:31 +00:00
Brian Paul
e96a121010 prefix MAKELIB with TOP in default case (Matt Sealey) 2003-10-27 20:04:43 +00:00
Brian Paul
20f40fa427 minor fix to glutSetColor prototype (Evgeny Kotsuba) 2003-10-27 18:33:34 +00:00
Brian Paul
73d4f69283 Pass $(MKLIB_OPTIONS) to mklib script to allow setting extra options. 2003-10-27 18:24:37 +00:00
Brian Paul
65e2ab3903 added MorphOS instructions (Matt Sealey) 2003-10-27 18:13:37 +00:00
Jon Smirl
b55921db48 Fix for missing GLAPIENTRYP definition 2003-10-24 20:44:55 +00:00
Daniel Borca
c0d83cd054 entrypoints... again 2003-10-23 13:57:31 +00:00
Daniel Borca
79fa6b9881 more MinGW fixes 2003-10-23 13:28:05 +00:00
Brian Paul
76692c5ce2 s/GLuint */GLvoid */ 2003-10-23 12:19:10 +00:00
Daniel Borca
3fe2af23ef added a few missing GLAPIENTRYs to make MinGW compile again 2003-10-23 12:02:36 +00:00
Brian Paul
c5b1e81de4 Initial work for bounds checking of vertex arrays and vertex buffer objects.
Only glDrawArrays() done so far.
Simplified glVertex/Color/etcPointer functions.
Misc casts added here and there.
2003-10-22 22:59:07 +00:00
Kendall Bennett
15c37348a5 More SciTech SNAP updates. Some of these files didn't really change, but
they show up in the list (GLU stuff) for some reason. The major change
here is the addition of code in the glx86asm.py file to generate assembler
stub entry points with the correct name decorations for _stdcall calling
conventions so this can be used on Windows boxes.
2003-10-22 21:02:15 +00:00
Daniel Borca
23f45833aa cosmetics and memos 2003-10-22 11:34:22 +00:00
Daniel Borca
e87d106d66 small fixes to accomodate Intel compiler/linker 2003-10-22 11:33:14 +00:00
Daniel Borca
758cbc68de fixed a typo (array size) 2003-10-22 11:30:37 +00:00
Kendall Bennett
c329e5a3d8 Updates to SSE assembler support for Open Watcom 2003-10-21 23:53:34 +00:00
Kendall Bennett
c40d1dd62d Added GLAPIENTRY decorations for all first level OpenGL API function entry
points so that the calling conventions will work correctly with the assembler
stubs with the Open Watcom compiler.
2003-10-21 22:22:17 +00:00
Alan Hourihane
b1ca87a565 prevent from optimizing out by some compilers (from XFree86 CVS) 2003-10-21 21:49:23 +00:00
Brian Paul
35b52c72d0 added more debug code and tests 2003-10-21 14:56:53 +00:00
Brian Paul
b4590f1c94 wrap in #ifdef FX / #endif 2003-10-21 14:55:27 +00:00
Brian Paul
ce8e13dc79 fix an error message 2003-10-21 14:54:16 +00:00
Daniel Borca
1b6cca67b5 documentation update; also new makefiles for Win32 MesaFX build 2003-10-21 11:15:52 +00:00
Jouk Jansen
1d61db5f31 Committing in .
The latest version of the OpenVMS DECCRTL contains (v)snprintf
 If this one is beeing used the (v)snprintf routines are not compiled in
 from mesa's source.

 Modified Files:
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/main/imports.c
 ----------------------------------------------------------------------
2003-10-21 10:12:47 +00:00
Daniel Borca
6d4afe2a95 fixed some NASM opcodes; added segment overrides and temporary labels 2003-10-21 08:33:10 +00:00
Daniel Borca
f03cb2e4ee Napalm total immersion 2003-10-21 08:31:02 +00:00
Daniel Borca
3f60e4f21b cosmetics; translated asm routines for use with ASSYNTAX.H 2003-10-21 08:27:21 +00:00
Jon Smirl
1aa28b3fe3 Clean out some unused files 2003-10-21 06:26:05 +00:00
Jon Smirl
bcc6eddd33 Update DRI drivers to current DRI CVS and make them work. 2003-10-21 06:05:39 +00:00
Karl Schultz
906449753f Define GLAPIENTRYP properly so that GLU compiles on Windows. 2003-10-20 17:36:41 +00:00
Karl Schultz
ec7eb274ab Fix error in last check-in. 2003-10-20 16:48:14 +00:00
Karl Schultz
3aaeec6a01 Add missing files for building Windows distribution. 2003-10-20 16:28:00 +00:00
Jon Smirl
3e4a50f0d2 Fix Makefiles to copy lib to $(TOP)/lib if missing 2003-10-20 02:17:32 +00:00
Brian Paul
0f85b91c8a Move initialization of default ctx->Driver.buffer-object-functions into
bufferobj.c so all the drivers don't have to worry about them.
2003-10-19 15:10:36 +00:00
Brian Paul
2bd4b68c5e fix CVS info 2003-10-17 14:09:54 +00:00
Brian Paul
7c276acb6f add .dsp files to tarballs 2003-10-16 19:30:22 +00:00
Brian Paul
5cd54509f5 update list of files for tarballs 2003-10-16 19:25:24 +00:00
Brian Paul
e8db87ee88 obsolete 2003-10-16 16:33:51 +00:00
Brian Paul
3eb0edb31f added GL_ARB_point_sprite tokens 2003-10-16 16:33:05 +00:00
Jon Smirl
93dc6942eb Define SOLO so that check is possible for SOLO in project makefiles 2003-10-16 04:54:24 +00:00
Jon Smirl
3fc0db95e4 Minor changes to make linux-solo build again 2003-10-16 04:50:42 +00:00
Brian Paul
f62b8985d6 protect whole file with #ifdef FX 2003-10-15 21:13:15 +00:00
Brian Paul
4eaf56a160 fix minor warnings from g++ 3.2 2003-10-15 21:11:13 +00:00
Brian Paul
16927d02bc initialize GetBufferSubData pointer 2003-10-15 20:51:28 +00:00
Brian Paul
49aefce5e5 minor tweaks 2003-10-15 20:50:41 +00:00
Kendall Bennett
596d57c42a Updates to SGI GLU code to get it to compile clean with the Open Watcom compiler.
Most of the changes were to get rid of warnings, but many of the warnings could
not be removed in the code so I also added #pragma's to disable the warnings.
Someone really should clean up this code, but I didn't want to mess with it
that much (and potentially break it).
2003-10-14 23:48:57 +00:00
Kendall Bennett
9b77fb7dab Updates to x86 assembler support for Open Watcom and SNAP 2003-10-14 23:47:21 +00:00
Brian Paul
0f22705b0b remove some cruft 2003-10-14 16:59:44 +00:00
Brian Paul
4524274377 exercise more vertex buffer object functions 2003-10-14 15:49:12 +00:00
Brian Paul
0bb281ba21 bufObj->Access wasn't being set 2003-10-14 15:48:39 +00:00
Daniel Borca
0219d1168e minor fixes + doc update 2003-10-14 14:56:45 +00:00
Brian Paul
4b6f6e1b3d minor fix in buffer_object_get_target() 2003-10-14 14:49:39 +00:00
Daniel Borca
fd83bc2b33 glide driver (wip) 2003-10-13 11:14:58 +00:00
Daniel Borca
6c520ef3d3 GameMode 2003-10-13 11:05:36 +00:00
Brian Paul
e4db8eb6fa added GL_ARB_point_sprite demo, texgen bug fix 2003-10-11 16:42:15 +00:00
Brian Paul
2655e68504 fix some sphere texgen bugs (reported by Daniel Borca) 2003-10-11 16:34:32 +00:00
Brian Paul
4128d88b98 s/GL_COLOR_INDEX/OSMESA_COLOR_INDEX/ 2003-10-11 15:41:34 +00:00
Brian Paul
5dce1e5c42 don't request accum buffer in color index mode 2003-10-11 15:39:11 +00:00
Brian Paul
dd29e04bd6 don't use color table's format to determine texture env functions 2003-10-11 15:30:14 +00:00
Karl Schultz
ad5cd6d337 Add missing entry points. (Warren Cashen) 2003-10-10 22:09:05 +00:00
Brian Paul
e6804945b3 add switch defaults to silence warnings 2003-10-10 18:11:17 +00:00
Brian Paul
db40aec48c remove bogus _swrast_texture_table_lookup() call (Eric Plante) 2003-10-10 18:10:54 +00:00
Brian Paul
78f8292a54 old/unused 2003-10-10 18:00:57 +00:00
Brian Paul
1c4b7116c4 Eric Plante's updates for OSMesa16. 2003-10-10 17:58:38 +00:00
Karl Schultz
faa2b09012 Add notes about building with the mangled namespace on Windows. 2003-10-10 17:13:47 +00:00
Kendall Bennett
d4155bd1df Added missing #undef SPAN_VARS to swrast/s_spantemp.h 2003-10-09 22:39:07 +00:00
Daniel Borca
009d7f8ba1 Minor MinGW fixes 2003-10-09 15:15:07 +00:00
Daniel Borca
1ffdad4939 FEATURE_ARB_vertex_buffer_object 2003-10-09 15:13:30 +00:00
Daniel Borca
d9f1e453ea Reorganized combiners. Added optimized span functions. 2003-10-09 15:12:20 +00:00
Keith Whitwell
bcb3957b6c Eric's mesa-depth32.diff 2003-10-09 11:33:38 +00:00
Kendall Bennett
2cdd699a77 More SciTech SNAP specific changes to glheader.h. Also modified the macros
in swrast/s_spantemp.h to allow dithering to be used in the SNAP drivers.
2003-10-08 01:53:30 +00:00
Keith Whitwell
4e5b58f483 index wasn't being calculated correctly (result was being discarded)
in light_ci()
2003-10-07 12:37:23 +00:00
Keith Whitwell
a4fc8035f1 VertexAttrib4fv wasn't being installed (4f was). 2003-10-06 17:57:48 +00:00
Keith Whitwell
3e291c01ea Fix typo 2003-10-06 14:19:53 +00:00
Brian Paul
facb597f48 fix error message (bug 816876) 2003-10-03 14:37:18 +00:00
Brian Paul
5fd77da4f6 improved 'clean' targets (Otto Solares) 2003-10-03 14:03:14 +00:00
Kendall Bennett
7d8eb0604a Removed bogus OS/2 floating point->integer conversion routine 2003-10-03 01:38:28 +00:00
Kendall Bennett
d7fe183f76 Fixed incorrect Watcom assembler macros 2003-10-03 00:15:13 +00:00
Kendall Bennett
adbbea9b51 Fixed bugs in Mesa software span rendering for color index modes 2003-10-02 23:50:44 +00:00
Brian Paul
a75246f8f5 updates from Daniel Borca 2003-10-02 17:36:43 +00:00
Kendall Bennett
d6643331ab Updates required for building the SciTech SNAP version of Mesa. This includes:
1. Changes to the main header files to exclude some stuff is __SCITECH_SNAP__
   is defined. The main GL/gl.h header file in SciTech SNAP is actually a wrapper
   that defines a bunch of necessary stuff and then included GL/gl_mesa.h which
   is the normal Mesa GL/gl.h header file renamed.

2. Changed APIENTRY * to APIENTRYP macros in the GL/gl.h and GL/glext.h header
   files. This will better support other compilers like IBM VisualAge C++. I
   added a basic macro for APIENTRYP to GL/gl.h (inside the !SNAP block), so
   existing code will compile the same, but when the SNAP version is being
   built we will use the correc definitions for the target compiler.

3. Changed a few more void * declarations to GLvoid *'s to avoid Open Watcom
   compiler complaints.

4. Updates the OPENGL_VERSION macro to include a patch number (set to 0 for
   now). Probably not necessary, but the original macro was wrong and we use
   that macro in our code.

5. Changed _tnl_end() to _tnl_end_ctx() to avoid conflicts with _tnl_End when
   using a compiler that has a case insensitive link.
2003-09-30 20:02:27 +00:00
Alan Hourihane
7214e1a1c4 char -> GLubyte 2003-09-30 12:59:17 +00:00
Alan Hourihane
e508f7f08e add gamma driver - no kernel driver yet
(build tested, not physically tested)
2003-09-30 11:28:16 +00:00
Alan Hourihane
0f2e186926 add the SiS driver - no kernel driver yet
(build tested, but not physically tested)
2003-09-30 11:13:31 +00:00
Alan Hourihane
525dda4f26 fix cut & paste errors 2003-09-30 11:05:46 +00:00
Alan Hourihane
6bec5b30e1 add the i830 driver - no kernel driver yet
(build tested, but not physically tested)
2003-09-30 11:02:38 +00:00
Alan Hourihane
73b0420bba add the i810 driver - no kernel driver yet
(build tested, but not physically tested)
2003-09-30 10:54:15 +00:00
Alan Hourihane
5b5142b543 mkdir the server directory, as using cvs with -P would prune an empty
directory
2003-09-30 10:29:15 +00:00
Karl Schultz
cafc787027 Add project file for new spriteblast demo. (Update dependency) 2003-09-25 19:17:30 +00:00
Karl Schultz
26577e4939 Add project file for new spriteblast demo. 2003-09-25 19:15:22 +00:00
Brian Paul
1a89978d83 GL_ARB_point_sprite demo 2003-09-24 20:41:53 +00:00
Karl Schultz
77a505a4bb MS dev studio project file for teapots demo. 2003-09-24 17:37:00 +00:00
Karl Schultz
c1cbde2ae1 Workspace file for redbook programs 2003-09-24 17:36:00 +00:00
Karl Schultz
2c9618bb12 Change projection transform so that the top row of teapots are now visible. 2003-09-24 17:34:32 +00:00
Brian Paul
9b101c34da added info about vertex/fragment program debugger 2003-09-23 15:40:57 +00:00
Brian Paul
b0cde83906 enum updates 2003-09-23 14:46:11 +00:00
Brian Paul
d7dabacfa3 new enum values for GL_MESA_program_debug 2003-09-23 14:44:33 +00:00
Brian Paul
8f7141e970 minor clean-ups 2003-09-23 14:42:52 +00:00
Brian Paul
d01681d6c9 remove a _TriangleCaps reference 2003-09-23 14:41:02 +00:00
Karl Rasche
d11bb2b297 Add extra cases and enums for _mesa_fetch_state(), and set the length of
program_parameter.StateIndexes[] to 6, used for fetching matrix state
2003-09-23 00:45:56 +00:00
Karl Schultz
f3a63d69ff Create 'all' project to make it easy to build and clean all the programs in the demos directory. 2003-09-22 18:21:19 +00:00
Karl Schultz
ea9365b48a Add remaining demos. 2003-09-22 18:03:09 +00:00
Karl Schultz
6872c21ace New visual studio project fiile for building demos. 2003-09-22 18:02:45 +00:00
Brian Paul
9d55394471 apply patch #740145 from SourceForge 2003-09-22 15:18:50 +00:00
Brian Paul
a13fb034cb casts 2003-09-19 15:39:11 +00:00
Brian Paul
e4fcea2e06 Assorted casts to silence g++ warnings. 2003-09-19 15:38:15 +00:00
Karl Schultz
74c33393b4 Add include for context.h to define NEED_SECONDARY_COLOR. 2003-09-19 15:28:45 +00:00
Karl Schultz
ff750fe8cb Make binary - even though this is a text file, common practice is to store MS studio files as binary 2003-09-19 15:08:42 +00:00
Brian Paul
04e6987de1 summary of Mesa's extension enum values 2003-09-19 15:07:57 +00:00
Karl Schultz
b263802bcf Make binary - even though this is a text file, common practice is to store MS studio files as binary 2003-09-19 14:58:35 +00:00
Brian Paul
361a9ac966 minor updates 2003-09-19 14:58:21 +00:00
Karl Schultz
a588e5af3b Make binary - even though this is a text file, common practice is to store MS studio files as binary 2003-09-19 14:49:54 +00:00
Brian Paul
effa9af9b1 added note about _TriangleCaps 2003-09-18 23:42:08 +00:00
Brian Paul
98cdf71f5a a few less occurances of _TriangleCaps 2003-09-18 23:36:07 +00:00
Brian Paul
29b4076f9a Move away from using the ctx->_TriangleCaps bitfield.
New macros in context.h for testing state: NEED_SECONDARY_COLOR
and NEED_TWO_SIDED_LIGHTING.
2003-09-18 23:21:08 +00:00
Brian Paul
1a8ebb8c2f tweak an error message 2003-09-18 23:10:36 +00:00
Brian Paul
87f858dd7c s/_backface_sign/_BackfaceSign/ 2003-09-18 22:25:31 +00:00
Karl Schultz
e4b40a7cf1 Updated for new Windows build system. 2003-09-18 19:10:53 +00:00
Karl Schultz
85be17868c Now obsolete. 2003-09-18 18:40:22 +00:00
Karl Schultz
84c2730866 New visual studio workspace and projects for building demos. 2003-09-18 18:39:53 +00:00
Karl Schultz
80d719f11a Remove first attempt at using visual studio projects to compile demos. 2003-09-18 18:35:29 +00:00
Karl Schultz
315e78b0b5 Update with current set of gl* entry points. 2003-09-18 18:32:13 +00:00
Brian Paul
2c5f5dc7fe Move macros from header to C file. Updated some comments 2003-09-18 17:00:14 +00:00
Brian Paul
06588db3fa Move context ASSERT/FLUSH macros to context.h 2003-09-18 16:45:44 +00:00
Brian Paul
3173277e20 remove MESA_TRACE stuff 2003-09-18 16:39:09 +00:00
Brian Paul
8512074b90 version tweaks 2003-09-18 16:34:35 +00:00
Brian Paul
bd3096edc3 removed unused NoRaster and Rendering fields from GLcontext 2003-09-18 16:33:10 +00:00
Brian Paul
99823b3744 Remove FLT_MIN definition to imports.h
Assorted code clean-ups in light.c
2003-09-18 16:18:43 +00:00
Karl Schultz
0c415bca5c Copy the DLL files to the lib directory instead of libexec. 2003-09-18 15:41:01 +00:00
Karl Schultz
4ba2986c06 Add symbols to export private entry points to osmesa. 2003-09-18 15:15:38 +00:00
Karl Schultz
a01566e468 Add casts to prevent double->float conversion compiler warnings. 2003-09-18 15:14:58 +00:00
Karl Schultz
df8d337eec Add casts to prevent signed/unsigned compare compiler warnings. 2003-09-18 15:14:10 +00:00
Brian Paul
65f605849a assorted updates 2003-09-17 21:36:08 +00:00
Brian Paul
83f57e32ca updated with new extension info 2003-09-17 21:22:54 +00:00
Brian Paul
bbd9a0c2b4 remove unused Target field from gl_buffer_object 2003-09-17 21:18:46 +00:00
Brian Paul
66e6e3e8e1 Fixed/added some error checks.
Allow one buffer to be bound to multiple targets.
Rebind buffer 0 when deleting currently bound buffer.
2003-09-17 21:18:22 +00:00
Jon Smirl
ea7bf8b130 Add cast to remove compiler warning 2003-09-17 21:14:22 +00:00
Brian Paul
6296276ebe unbind vertex arrays from buffer in DeleteBuffersARB() 2003-09-17 18:58:09 +00:00
Brian Paul
1ceeac29ec s/GL_READ_WRITE_ARB/GL_WRITE_ONLY_ARB/ 2003-09-17 18:20:52 +00:00
Brian Paul
de8d410a99 Exercise the GL_ELEMENT_ARRAY_BUFFER_ARB path 2003-09-17 18:15:47 +00:00
Brian Paul
d2afb39d19 Implement GL_ELEMENT_ARRAY_BUFFER_ARB for buffer objects. 2003-09-17 18:15:13 +00:00
Jose Fonseca
1a5709dc5b Change the hyperlinks names in the main page to match the Doxygen generated ones. 2003-09-17 17:14:11 +00:00
Jose Fonseca
9109625c03 Seperate the Doxygen configuration files (for full Mesa only) in a common part and an individual module part.
Rewrite the Makefile in order to avoid the double pass when the tag files already exist. A double pass can still be achieved by doing 'make clean all'.
2003-09-17 17:07:24 +00:00
Brian Paul
6bced0148e test GL_ARB_vertex_buffer_object 2003-09-17 16:27:07 +00:00
Brian Paul
57d882b684 GL_ARB_vertex_buffer_object working now, at least for non-indexed
vertex arrays.
2003-09-17 16:06:49 +00:00
Jose Fonseca
397d1e4d57 Merge the Doxygen configuration files from the embedded branch. 2003-09-17 16:00:10 +00:00
Brian Paul
5543901b96 new casts 2003-09-17 03:46:34 +00:00
Brian Paul
84351999ec added call to _mesa_enable_1_5_extensions() 2003-09-17 03:42:14 +00:00
Brian Paul
148a2847a1 More work on ARB_vertex_buffer_object.
Use GLubyte * instead of void * for gl_client_array->Ptr to simplify upcoming
pointer arithmetic changes.
2003-09-17 03:40:11 +00:00
Brian Paul
4561f84183 changed a comment 2003-09-17 03:34:29 +00:00
Brian Paul
278ce99171 move a comment 2003-09-17 03:33:54 +00:00
Brian Paul
b04633d727 move some functions, add some comments 2003-09-17 03:33:10 +00:00
Brian Paul
458c900d3b set ARB_vertex_buffer_object in _mesa_enable_sw_extensions() 2003-09-17 03:32:12 +00:00
Brian Paul
978646d86f fix up FEATURE_* defines 2003-09-17 03:31:30 +00:00
Brian Paul
1d57658ee5 minor simplification 2003-09-15 19:57:11 +00:00
Brian Paul
aa00d122b8 Some work on ARB_vertex_buffer_object.
Use GL_CLIENT_ACTIVE_TEXTURE when returning texcoord array values in get.c
2003-09-15 19:55:10 +00:00
Kendall Bennett
b29b8ca47d Updates to fix problems building with the Open Watcom compiler. 2003-09-12 22:01:01 +00:00
Brian Paul
438a898dcf allow glTexImage1/2/3D width/height/depth = 0 2003-09-12 15:04:12 +00:00
Brian Paul
973da83f62 Allow glTexImage1/2/3D to specify width/height/depth = 0.
This allows texture state to be resettable to default state.
Not allowed according to the spec, but allowed by all other OpenGL libs.
2003-09-12 15:03:12 +00:00
Brian Paul
5c480a4887 display list support for ARB_vertex/fragment_program 2003-09-09 15:35:37 +00:00
Brian Paul
90f673e3ec plug in vertex buffer object functions 2003-09-09 15:10:44 +00:00
Brian Paul
ca29a7c731 remove duplicate sunos5-smp entries 2003-09-09 15:08:44 +00:00
Brian Paul
c7b872a277 Added prototypes for internal functions to bufferobj.h.
Minor code clean-ups.
2003-09-09 13:44:40 +00:00
Brian Paul
39c65bfb93 remove last of mklib.solaris stuff 2003-09-09 13:33:12 +00:00
Ian Romanick
0207b47aaf Added most of the infrastructure required to support
ARB_vertex_buffer_object.  THIS IS INCOMPLETE.
2003-09-09 00:10:12 +00:00
Brian Paul
0a363f4e87 fix timer bug (801485) 2003-09-08 15:23:55 +00:00
Brian Paul
50253ea0a3 Remove all the swap_control stuff from glxgears demo (restored to vers 1.2).
New glxswapcontrol.c file added.
2003-09-08 15:06:23 +00:00
Brian Paul
176108767d SunOS tweaks (Greg Menke) 2003-09-08 14:59:11 +00:00
Brian Paul
e39cbf63f6 update sunos5 targets (Greg Menke) 2003-09-08 14:58:05 +00:00
Brian Paul
445ecdcebd use GL_GLEXT_PROTOTYPES 2003-09-08 14:56:41 +00:00
Brian Paul
91253e7be5 more debugger development 2003-09-05 19:34:58 +00:00
Brian Paul
054fedb455 fix typo 2003-09-05 19:34:25 +00:00
Brian Paul
94f944762d move GL_MESA_program_debug code into program.c 2003-09-05 19:27:25 +00:00
Brian Paul
6c57b379a4 misc updates 2003-09-05 14:53:25 +00:00
Brian Paul
1ac73bc993 update directories 2003-09-05 14:47:24 +00:00
Brian Paul
5f37abfc43 updated info for Mesa 5.1 2003-09-05 14:47:07 +00:00
Brian Paul
ade4de9b5d Updated for 5.0.2 release. 2003-09-05 13:39:39 +00:00
Brian Paul
044f20d1ea files for CVS to ignore 2003-09-05 12:51:24 +00:00
Jouk Jansen
054b5aef92 Committing in .
Added missing include files.

 Modified Files:
 	Mesa-newtree/progs/demos/isosurf.c
 	Mesa-newtree/src/mesa/main/nvvertexec.c
 ----------------------------------------------------------------------
2003-09-05 09:37:32 +00:00
Brian Paul
d402cb97bd implement SWZ and TXB. some code clean-up 2003-09-04 23:55:33 +00:00
Brian Paul
0d08399d8d move SWIZZLE_ZERO/ONE tokens to program.h 2003-09-04 23:38:03 +00:00
Brian Paul
0ac157ddc4 import 5.0.2 info 2003-09-04 23:10:38 +00:00
Brian Paul
9c9c2cd725 Added new opcodes for ARB_fragment_program, like ABS, CMP, TXB, etc. 2003-09-04 15:18:22 +00:00
Brian Paul
e082348a4b a little more MiniGLX info 2003-09-03 23:10:31 +00:00
Brian Paul
afc0428b5c assorted updates 2003-09-03 23:04:31 +00:00
Brian Paul
56e9efa15d added fbdev/DRI and MiniGLX info 2003-09-03 23:04:02 +00:00
Brian Paul
eaf2f5bb4f fix a few typos for linux-solo 2003-09-03 20:48:05 +00:00
Brian Paul
feb9e4c432 ARB_point_sprite is not part of OpenGL 1.5 2003-09-03 18:04:02 +00:00
Brian Paul
03f0ddbe4c include math.h 2003-09-03 17:21:51 +00:00
Brian Paul
67c1fd2fdb add -lCrun for sunos5, added sunos5-smp (Greg M) 2003-09-03 14:34:55 +00:00
Ian Romanick
c8363a31cf Added support for EXT_texture_mirror_clamp and the single wrap mode
that it addes to ATI_texture_mirror_once.  This includes updating the
texwrap test to exercise the new mode.
2003-09-02 19:25:17 +00:00
Brian Paul
886bc6f36c remove -malign-loops=2 -malign-functions=2 (bug 738020) 2003-09-02 18:19:53 +00:00
Brian Paul
c86eab8478 added GLUT_CFLAGS to compile GLUT with -fexceptions (bug 726223) 2003-09-02 18:06:18 +00:00
Brian Paul
352e0d0d27 pbuffer info 2003-09-02 16:58:14 +00:00
Brian Paul
21d956106e fix-up CXXFLAGS (bug 757292) 2003-09-02 16:43:01 +00:00
Brian Paul
08dbe5664d add missing glNormal, glVertex calls (Michal Wozniak) 2003-09-02 15:10:32 +00:00
Brian Paul
77e85f133c update from Daniel Borca 2003-09-02 14:47:51 +00:00
Brian Paul
0d4da529bd fix fog.End error 2003-09-02 13:36:03 +00:00
Brian Paul
b3680df593 s/DP4/DP3/ 2003-08-31 19:06:10 +00:00
Brian Paul
254e201721 s/DP4/DP3/ 2003-08-31 18:57:17 +00:00
Brian Paul
2b7a01a39b always assign texcoord[i][3] to silence valgrind 2003-08-31 18:55:55 +00:00
Brian Paul
7961e67c2a update parameter indexing 2003-08-31 18:55:23 +00:00
Brian Paul
1c5ff572aa added program.c plus minor fixes 2003-08-31 18:54:52 +00:00
Brian Paul
bd7a3de4b3 added minor assertion 2003-08-31 18:53:45 +00:00
Brian Paul
04a81da03b Moved some shared vertex/fragment program code into new program.c file.
Implemented new program_parameter_list type and functions for dealing with
named program parameters, constants and GL state references.
New state_index enum for describing GL state referenced within ARB vertex/
fragment programs.  Plus, functions for fetching named GL state.
2003-08-31 18:52:47 +00:00
Karl Schultz
e38a55ecb2 Generate browse info for Debug version. 2003-08-30 16:08:35 +00:00
Karl Schultz
dc24230de7 Silence compiler warnings about implicit casts or conversions by supplying explicit casts and/or tweaking constant and variable definitions. 2003-08-30 14:45:04 +00:00
Brian Paul
d12a871b21 s/GLuint/GLint/ 2003-08-29 14:45:45 +00:00
Brian Paul
e39a334f1a fix minor warnings with casts 2003-08-29 14:45:15 +00:00
Karl Schultz
c769a7febf add arbfragparse.c to project. 2003-08-29 13:57:27 +00:00
Brian Paul
f5515cb4af Move clamping of texture LOD bias to texture application time. 2003-08-28 23:31:00 +00:00
Brian Paul
760960028f Updates from Daniel Borca 2003-08-28 16:57:01 +00:00
Brian Paul
9e94aaf6e3 remove unused bytes variable 2003-08-28 03:10:41 +00:00
Brian Paul
3a604da4cc added GL_EXT_texture_lod_bias to OpenGL 1.4 feature list 2003-08-28 03:10:00 +00:00
Brian Paul
58c5df87be remove a bunch of the extension definitions from the legacy section 2003-08-28 03:08:40 +00:00
Brian Paul
0b12650701 space bar to toggle animation 2003-08-28 03:07:49 +00:00
Brian Paul
781fb93877 Added OpenGL 1.4's per-texture LOD bias. 2003-08-28 03:04:41 +00:00
Brian Paul
a6ed6f48e6 make _glapi_get_proc_address() return NULL if function doesn't start with gl prefix 2003-08-27 14:48:16 +00:00
Jouk Jansen
d49acd629b Committing in .
Added a type cast to silence the OpenVMS DECC compiler

 Modified Files:
 	Mesa-newtree/src/mesa/swrast/s_nvfragprog.c
 ----------------------------------------------------------------------
2003-08-27 11:12:35 +00:00
Brian Paul
d2d3052378 latest extensions and updates 2003-08-24 14:56:20 +00:00
Brian Paul
371f7cdb7a fix PFNGLMULTIMODEDRAWARRAYSIBMPROC 2003-08-24 14:49:53 +00:00
Brian Paul
f9dbd07e14 regenerated for GL_IBM_multimode_draw_arrays 2003-08-24 14:42:11 +00:00
Jon Smirl
dc22a652c9 Fix compile problems with `glMultiModeDrawArraysIBM'
Adjust makefiles to create depends and not store it in CVS
Remove dependency on kernel pci_ids.h
2003-08-24 04:44:23 +00:00
Brian Paul
d620015abd indentation fix 2003-08-23 21:44:08 +00:00
Brian Paul
2230b8518e test program to exercise glDraw/ReadPixels(GL_DEPTH_COMPONENT) and pixel zooming 2003-08-23 21:42:57 +00:00
Brian Paul
4be6c0f04b glDrawPixels(GL_DEPTH_COMPONENT) with glPixelZoom didn't work 2003-08-23 21:40:21 +00:00
Jon Smirl
a3a10e6dfc Add missing assembly file from radeon build 2003-08-23 05:05:11 +00:00
Jon Smirl
e28a4c147c Remove files not used in current MGA driver 2003-08-23 05:01:38 +00:00
Jon Smirl
1da1f1e4ba update fb makefile for new directory structure, add depends 2003-08-23 04:58:24 +00:00
Jon Smirl
7c819439ba Rename Makefile to Makefile.X11, add depend support 2003-08-23 01:34:56 +00:00
Jon Smirl
52f246bd23 Added missing includes for standard header files 2003-08-23 01:28:59 +00:00
Jon Smirl
724c2c7f6f Add file miniglx.h 2003-08-23 01:25:30 +00:00
Jon Smirl
ae530c2ff9 Renaming Makefile to Makefile.X11, added depend support, adjusted paths 2003-08-23 01:12:35 +00:00
Ian Romanick
6373672367 Trivial changes to add support for GL_ARB_point_sprite, which is a
subset of GL_NV_point_sprite (which was already supported).
2003-08-23 00:12:46 +00:00
Ian Romanick
3baefe663b Added support for GL_IBM_multimode_draw_arrays.
Added non-static entrypoints and the name string for
GL_SUN_multi_draw_arrays (identical to GL_EXT_multi_draw_arrays).

Made add_newer_entrypoints (in src/mesa/main/context.c) table driven.
This reduced the size of context.o by about 3KB.
2003-08-22 23:28:03 +00:00
Brian Paul
5df82c82bd patch to import Jon Smirl's work from Bitkeeper 2003-08-22 20:11:43 +00:00
Brian Paul
1a84876d79 restore gcc-sl config 2003-08-22 18:06:59 +00:00
Brian Paul
4778beb761 updates from Daniel Borca 2003-08-22 13:47:08 +00:00
Keith Whitwell
12c037dbff Use correct conversions when translating array colors. 2003-08-20 07:21:41 +00:00
Brian Paul
9ec58c2c5b DOS and glide driver updates from Daniel Borca 2003-08-19 15:52:51 +00:00
Brian Paul
3dc8cc4ebc glPixelMap fix 2003-08-19 01:09:57 +00:00
Brian Paul
9d73b81068 Fix glPixelMap: s/GLint/GLsizei/ 2003-08-19 01:08:24 +00:00
Brian Paul
d4576154e6 glPixelMap[f/ui/us]v()'s size parameter is GLsizei, not GLint. 2003-08-19 01:07:26 +00:00
Brian Paul
bb93870133 simplify some python code 2003-08-19 01:06:24 +00:00
Brian Paul
8a033fa135 minor code improvement in glGenTextures 2003-08-18 19:45:42 +00:00
Brian Paul
01bb309cce register file changes 2003-08-17 17:12:35 +00:00
Brian Paul
f2dd273322 Re-org of register files for vertex/fragment programs. Will be easier to
hook in global state references, etc. for ARB programs.
2003-08-17 17:11:50 +00:00
Brian Paul
4f12be0249 fix some broken links 2003-08-15 19:10:47 +00:00
Jouk Jansen
3bbe68510f Committing in .
Update OpenVMS makefile due to new source files.

 Modified Files:
 	Mesa-newtree/src/mesa/main/descrip.mms
 ----------------------------------------------------------------------
2003-08-11 11:46:36 +00:00
Brian Paul
e17c1abd67 added arbfrag/vertparse 2003-08-06 19:24:44 +00:00
Brian Paul
b5a41d6050 prep for OpenGL 1.5 2003-08-06 19:24:02 +00:00
Brian Paul
2c50b922d6 fix a bunch of warnings 2003-08-06 19:23:20 +00:00
Brian Paul
49555d14a8 remove temporary prototypes 2003-08-06 19:22:59 +00:00
Brian Paul
8f44286b29 placeholder files 2003-08-06 19:22:37 +00:00
Brian Paul
1b252a4f6f added info about Mesa-newtree 2003-08-06 19:16:48 +00:00
Brian Paul
824a4fc34f updated item 1.4 2003-08-06 19:05:26 +00:00
Keith Whitwell
93a458840c Shared dri driver resources 2003-08-06 18:12:22 +00:00
Keith Whitwell
b32a036059 Not-quite-functional swrast-only dri driver 2003-08-06 18:11:57 +00:00
Keith Whitwell
b93652d67e Shared radeon/r200 init code 2003-08-06 18:10:59 +00:00
Brian Paul
676cf71852 Added TOP to point to top of tree to find includes and libs 2003-08-06 18:04:32 +00:00
Keith Whitwell
848ff108a0 mga driver, brought over by Jon Smirl 2003-08-06 18:01:13 +00:00
Keith Whitwell
adbec39bbf r200 driver, brought over by Jon Smirl 2003-08-06 17:59:57 +00:00
Keith Whitwell
a7ea785a10 miniglx test programs 2003-08-06 17:47:15 +00:00
Keith Whitwell
fb4d5492e0 Newer version of this file 2003-08-06 17:15:29 +00:00
Keith Whitwell
ff56908e09 Store material attributes in an Attrib[] style array. This is a
first step to reviving/rescuing the 'vtx' rework from the old mesa
tree.
2003-08-05 18:55:49 +00:00
Keith Whitwell
e6dea091c0 Fix samples/fog.c regression - missing test for NeedEyeCoords. 2003-08-05 18:12:55 +00:00
Brian Paul
304d11e0e1 Updates from Daniel Borca. 2003-08-05 15:54:08 +00:00
Keith Whitwell
2880669853 Fix typo (& instead of &&) to fix olympic.c bug 2003-08-01 20:30:20 +00:00
Brian Paul
1a615070ed replace assertion with conditional 2003-07-30 23:13:39 +00:00
Karl Schultz
f88d846255 Moved. 2003-07-26 12:44:37 +00:00
Karl Schultz
acad0fae7f Add the C++ and response files to the project so that they show up in the project file list. 2003-07-26 12:43:39 +00:00
Karl Schultz
e7d9b3fdd7 Reorganized projects so there is one project for each Mesa source subdir, and put the actual project files in each subdir. 2003-07-26 12:42:45 +00:00
Karl Schultz
1b41c0d3d8 VC 6 Project File 2003-07-26 12:38:06 +00:00
Karl Schultz
4894df6cf2 minor option tweak 2003-07-25 16:43:31 +00:00
Karl Schultz
b9d9c1f40d Compiler/Linker "response" file containing compiler options and list of files to compile/link for the C++ files in the glu library. It is easier to edit and maintain this infomation in flat files instead of trying to enter it into the VC project menus. The C++ files are compiled as a "pre-link" step. 2003-07-25 16:38:17 +00:00
Karl Schultz
9b0bb3d052 Add documentation. 2003-07-25 16:35:25 +00:00
Karl Schultz
fd5889f975 Project now builds the C++ sources (with great difficulty). Add module definition file (glu.def) to project. 2003-07-25 16:35:05 +00:00
Karl Schultz
c2b39d0312 add a dependency so that osmesa builds 2003-07-25 16:32:50 +00:00
Karl Schultz
00d7f16dbd cleanup - add comments and sort names. 2003-07-25 14:44:57 +00:00
Brian Paul
c2aee04666 don't include malloc.h (bug 776574) 2003-07-24 22:41:17 +00:00
Karl Schultz
838bb33fe1 add osdemo project 2003-07-24 17:45:27 +00:00
Karl Schultz
0a5957bfb1 project file for osdemo 2003-07-24 17:45:09 +00:00
Karl Schultz
eb226f118f Add osmesa project 2003-07-24 17:44:17 +00:00
Karl Schultz
a3286498e6 add symbols needed by osmesa. 2003-07-24 17:43:40 +00:00
Karl Schultz
bd36e5f17b Project file for osmesa 2003-07-24 17:43:11 +00:00
Karl Schultz
4e245c334d moved to top of tree. 2003-07-24 17:10:03 +00:00
Karl Schultz
7d3bf7f6d1 Microsoft Visual Studio 6 Workspace file for building Mesa and related libraries. (Moved from src/mesa/drivers/windows to make it easier to find.) The project files belonging to the workspace are located elsewhere in the tree, closer to the modules they each build. 2003-07-24 17:09:29 +00:00
Brian Paul
3a25e2350a if texture color table is enabled, use the color table's format to evaluate the texture env function 2003-07-24 13:33:22 +00:00
Karl Schultz
df03f8ed6d fix location of mesa.def 2003-07-24 04:11:36 +00:00
Karl Schultz
adb5e0bb1d linker exports defs 2003-07-24 04:11:07 +00:00
Karl Schultz
95a791bb3e Project to build the gears demo program. 2003-07-24 03:55:25 +00:00
Karl Schultz
c7363f7a48 Workspace to build Mesa demos and sample programs. 2003-07-24 03:54:46 +00:00
Karl Schultz
c06ff13b14 Project file to build GLUT32.DLL 2003-07-24 03:52:43 +00:00
Karl Schultz
5c04693a3f Project file to build GLU32.DLL 2003-07-24 03:51:43 +00:00
Karl Schultz
b6a74a4f6e Source code for GDI driver. 2003-07-24 03:47:46 +00:00
Karl Schultz
fbd052efed Project file to build gdi driver and OPENGL32.DLL. 2003-07-24 03:47:22 +00:00
Karl Schultz
9baab01c1f Project file to build tnl - creates static LIB that is later linked to make a DLL. 2003-07-24 03:46:20 +00:00
Karl Schultz
bff1bf9794 Project file to build swrast - creates static LIB that is later linked to make a DLL. 2003-07-24 03:45:58 +00:00
Karl Schultz
b1bc0dc3f4 Project file to build core mesa - creates static LIB that is later linked to make a DLL. 2003-07-24 03:45:27 +00:00
Karl Schultz
341313b601 Visual Studio Workspace file for building Mesa. This workspace contains projects for building core mesa, backend drivers (e.g., gdi, dx7, ...), GLU, and GLUT. The project files are placed in the appropriate places in the Mesa tree. 2003-07-24 03:40:29 +00:00
Karl Schultz
f78311ed64 Removing from this directory. Will be added to new gdi driver directory. 2003-07-24 03:37:01 +00:00
Karl Schultz
6ff00f91c8 Remove obsolete file. 2003-07-24 03:35:34 +00:00
Karl Schultz
6b4716c63a Windows does not define HUGE_VAL, so use the IEEE hex constants. 2003-07-24 03:18:44 +00:00
Brian Paul
9c7b81697b fix a few more glitches from last big check-in 2003-07-23 21:21:30 +00:00
Brian Paul
9f9bed9c8e fix GL_SGI_texture_colortable bugs 2003-07-23 17:13:48 +00:00
Brian Paul
d19b5db5dc fill in chapter 5, 6 text 2003-07-23 15:45:25 +00:00
Brian Paul
ad6ecf0227 remove printf 2003-07-22 18:34:27 +00:00
Brian Paul
6a940e8946 New interactive debugging code - vertex or fragment program. 2003-07-22 03:53:44 +00:00
Brian Paul
05944c031c Restore more code lost during last big merge.
Rename colortable-related functions.
2003-07-22 03:51:46 +00:00
Brian Paul
f7fda86c6d Implement debugger callback, etc for vertex programs. Misc clean-ups. 2003-07-22 03:34:54 +00:00
Brian Paul
389858ee7b tokens, functions for GL_MESA_program_debug 2003-07-21 04:30:25 +00:00
Brian Paul
64da663f51 vertex/fragment debugger extension 2003-07-21 04:23:32 +00:00
Brian Paul
5366b01d86 test program for GL_MESA_program_debug extension 2003-07-21 04:22:59 +00:00
Brian Paul
08ff059f20 Initial implementation of GL_MESA_program_debug - a vertex/fragment program
debugging extension.
2003-07-21 04:22:40 +00:00
Brian Paul
190c11e06d Numbered productions for ARB_vertex_program grammar (Karl Rasche) 2003-07-18 16:45:38 +00:00
Brian Paul
9a0d97a21c Karl Rasche's ARB_vertex_program parser 2003-07-18 16:43:45 +00:00
Brian Paul
f44898c088 Fix up FEATURE_* defines in config.h
_glapi_add_entrypoint() updates in context.c
2003-07-18 15:44:57 +00:00
Brian Paul
702ca20bf0 Fix up some loose ends from the last big check-in. 2003-07-18 15:22:16 +00:00
Brian Paul
c19cbb58cd more DOS updates from Daniel Borca 2003-07-17 14:50:11 +00:00
Keith Whitwell
6dc8557500 Merge Jose's documentation and core Mesa changes from embedded branch 2003-07-17 13:43:59 +00:00
Brian Paul
44c699949a DOS updates from Daniel Borca 2003-07-11 16:33:43 +00:00
Brian Paul
356959952c added GL_VERSION check 2003-07-10 14:39:57 +00:00
Brian Paul
f6e76fe9b5 fix conformance glitch introduced with NPOT extension 2003-07-07 17:01:18 +00:00
Brian Paul
ef751eb08b minor fixes in _mesa_TexGen[id]v() to silence valgrind 2003-07-07 16:46:27 +00:00
Brian Paul
92d31641d2 fix int/float conversion for GL_TEXTURE_PRIORITY in gl[Get]TexParameteri[v] 2003-07-03 15:08:25 +00:00
Brian Paul
b464dee72b bigger window 2003-07-03 03:11:56 +00:00
Brian Paul
7568561fa7 GL_ARB_texture_non_power_of_two test program 2003-07-03 03:10:50 +00:00
Brian Paul
235c150f0a added GL_ARB_texture_non_power_of_two 2003-07-03 03:07:12 +00:00
Brian Paul
887e2cf01a Implemented GL_ARB_texture_non_power_of_two (except for auto mipmap generation). 2003-07-03 03:05:48 +00:00
Brian Paul
32bac60519 tweak checks for display list zero 2003-07-03 03:02:44 +00:00
Brian Paul
de4f460e20 Simplify extension string handling. 2003-07-03 02:15:06 +00:00
Jouk Jansen
9826ca3ef5 Committing in .
Enable installation on OpenVMS ODS5 disks.

 Modified Files:
 	Mesa-newtree/progs/demos/descrip.mms
 	Mesa-newtree/progs/tests/descrip.mms
 	Mesa-newtree/progs/xdemos/descrip.mms
 	Mesa-newtree/src/glut/glx/descrip.mms
 	Mesa-newtree/src/mesa/array_cache/descrip.mms
 	Mesa-newtree/src/mesa/drivers/osmesa/descrip.mms
 	Mesa-newtree/src/mesa/drivers/x11/descrip.mms
 	Mesa-newtree/src/mesa/glapi/descrip.mms
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/math/descrip.mms
 	Mesa-newtree/src/mesa/swrast/descrip.mms
 	Mesa-newtree/src/mesa/swrast_setup/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2003-07-02 14:23:49 +00:00
Brian Paul
4e28d962ff DOS updates (Daniel Borca) 2003-06-30 21:51:31 +00:00
Brian Paul
a58214e417 add a few more digits to PI to make Evgeny happy 2003-06-27 15:26:56 +00:00
Jouk Jansen
fb8105fbaa Committing in .
OpenVMS compile support for new directory tree
 One file was missing in the previous commit.


 Modified Files:
 	Mesa-newtree/src/glut/glx/mms_depend
 ----------------------------------------------------------------------
2003-06-17 07:22:29 +00:00
Jouk Jansen
ccb8284a5b Committing in .
OpenVMS support for new directory tree

 Modified Files:
 	Mesa-newtree/progs/demos/descrip.mms
 	Mesa-newtree/progs/tests/descrip.mms
 	Mesa-newtree/progs/xdemos/descrip.mms
 	Mesa-newtree/src/glu/sgi/descrip.mms
 	Mesa-newtree/src/glut/glx/descrip.mms
 	Mesa-newtree/src/mesa/main/descrip.mms
 Added Files:
 	Mesa-newtree/descrip.mms Mesa-newtree/mms-config.
 	Mesa-newtree/src/descrip.mms Mesa-newtree/src/glu/descrip.mms
 	Mesa-newtree/src/mesa/descrip.mms
 	Mesa-newtree/src/mesa/array_cache/descrip.mms
 	Mesa-newtree/src/mesa/drivers/osmesa/descrip.mms
 	Mesa-newtree/src/mesa/drivers/x11/descrip.mms
 	Mesa-newtree/src/mesa/glapi/descrip.mms
 	Mesa-newtree/src/mesa/math/descrip.mms
 	Mesa-newtree/src/mesa/swrast/descrip.mms
 	Mesa-newtree/src/mesa/swrast_setup/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 	Mesa-newtree/vms/analyze_map.com Mesa-newtree/vms/xlib.opt
 	Mesa-newtree/vms/xlib_share.opt
 ----------------------------------------------------------------------
2003-06-17 07:20:22 +00:00
Brian Paul
642699a19f DOS updates for new tree (Daniel Borca) 2003-06-16 14:32:44 +00:00
Brian Paul
710207c46f fix include paths (Daniel Borca) 2003-06-16 14:30:57 +00:00
Brian Paul
225517aff0 GLUT for OS/2 (Evgeny Kotsuba) 2003-06-13 21:49:46 +00:00
Brian Paul
8fa507592b fix typo, added space/anim control 2003-06-13 02:42:57 +00:00
Brian Paul
86258034d5 GL_ARB_occlusion_query demo. 2003-06-13 02:38:35 +00:00
Brian Paul
b17a722ca3 Implemented GL_ARB_occlusion_query (not 100% finalized). 2003-06-13 02:37:27 +00:00
Brian Paul
0c0e583c01 More clean-ups and re-org 2003-06-13 02:32:28 +00:00
Brian Paul
93db675bd9 added new GL_ARB_v_p instructions 2003-06-13 02:31:42 +00:00
Brian Paul
6a0db56269 s/ATTRIB_h/ATTRIB_H/ 2003-06-12 16:01:42 +00:00
Brian Paul
5ac9e660a6 added null pointer check in tnl_copy_to_current() 2003-06-11 18:48:54 +00:00
Brian Paul
b1d53d909d new buffer/context visual compatibility test (Phil Brown) 2003-06-11 18:48:19 +00:00
Brian Paul
196a90b511 added missing types to _mesa_VertexAttribPointerARB() 2003-06-11 18:47:51 +00:00
Brian Paul
5c08c5bff3 clean up _tnl_copy_to_current() 2003-06-11 14:38:17 +00:00
Brian Paul
f499860de4 moved from main/ to glapi/ 2003-06-10 21:55:20 +00:00
Brian Paul
de5496d2a6 Further makefile clean-up, concentrated on the x86 assembly files. 2003-06-10 21:47:59 +00:00
Brian Paul
5f3439916b fixes for x86 builds 2003-06-10 19:06:20 +00:00
Brian Paul
5e04bcf6de GL_EXT_texture_rectangle, directory tree info 2003-06-10 15:01:45 +00:00
Brian Paul
66a83c9e17 fix GL_CURRENT_VERTEX_ATTRIB_ARB queries 2003-06-10 14:56:40 +00:00
Brian Paul
9a2121cfb6 update for new directory tree 2003-06-10 14:54:37 +00:00
Brian Paul
cd0fbde699 add missing vertex attribs in _tnl_copy_to_current() 2003-06-10 14:48:47 +00:00
Brian Paul
829703316d fixed secondary color typo 2003-06-10 14:47:46 +00:00
Brian Paul
b953bebc25 updated old-style makefiles for new tree 2003-06-10 14:46:24 +00:00
Ian Romanick
9ac51f57ef Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything. 2003-06-05 00:50:18 +00:00
Brian Paul
b9e1411660 comments regarding window sizing 2003-06-04 17:18:09 +00:00
Brian Paul
3c28d1e2a9 Added GL_EXT_texture_rectangle (identical to GL_NV_texture_rectangle) 2003-06-04 12:59:01 +00:00
Ian Romanick
09dbc1e5ae Removed fields from 'struct gl_extensions' for extensions that don't
need them.  Added "always on" extensions for extensions that are part
of core versions 1.1 and 1.2.
2003-06-02 20:37:16 +00:00
Brian Paul
a189e4c1e1 s/DrawBuffer/ReadBuffer/ in _mesa_ResizeBuffersMESA (PHil Brown) 2003-06-02 16:46:48 +00:00
Brian Paul
c9ab99ced1 updated rule for make OSMesa lib (Brad King) 2003-06-02 15:42:23 +00:00
Brian Paul
45e9a5c46b Added GL_LIB_NAME / GLU_LIB_NAME so the default name for the libraries
can be overridden (Brad King).
2003-06-02 15:21:16 +00:00
Brian Paul
698e67d409 remove test file 2003-06-01 16:28:46 +00:00
Brian Paul
68155873bd updated release steps 2003-06-01 16:28:00 +00:00
Brian Paul
c0e1189bad latest updates for 5.1 2003-06-01 16:27:37 +00:00
Brian Paul
3ba8a49c81 Remove a bunch of really old/obsolete configs.
Use the new mklib script.
2003-06-01 16:25:02 +00:00
Brian Paul
8c20c7ba0c Replace most mklib.* scripts with a new uber-mklib script with more features. 2003-06-01 16:21:45 +00:00
Brian Paul
f1163a3769 setup default programs for GL_ARB_vertex/fragment_program 2003-06-01 15:39:58 +00:00
Brian Paul
236d2dbc72 minor error check tweaks for NV_light_max_exponent 2003-05-30 22:31:41 +00:00
Brian Paul
80f669b9b0 added GL_NV_light_max_exponent 2003-05-30 22:30:31 +00:00
Ian Romanick
882caa18c6 Added support for NV_light_max_exponent. 2003-05-30 21:37:14 +00:00
Ian Romanick
b2a4aecd80 Removed an accidental addition in the previous commit. 2003-05-30 18:41:38 +00:00
Brian Paul
f8f830d59d minor clean-ups 2003-05-30 15:42:22 +00:00
Brian Paul
62dc802818 misc changes from testing 2003-05-30 15:38:26 +00:00
Brian Paul
80b8665438 include readtex.h 2003-05-30 15:37:47 +00:00
Brian Paul
f98921d344 display both YCbCr and RGB image (Ian) 2003-05-30 15:36:04 +00:00
Brian Paul
785774deb2 applied Ian's misc patches 2003-05-30 15:30:16 +00:00
Brian Paul
dc3e0f0f5d s/_T_VBXFORM_H/_T_IMM_EXEC_H/ 2003-05-28 19:20:13 +00:00
Brian Paul
d18c08fe89 silence some warnings (Evgeny Kotsuba) 2003-05-28 15:30:53 +00:00
Brian Paul
0b52018df2 added MESA_VERSION() macro, etc (Holger Waechtler) 2003-05-28 14:30:45 +00:00
Brian Paul
e8e93e9cc6 glBindProgramARB dispatches to glBindProgramNV (remove _mesa_BindProgramARB).
Removed VertexAttrib*ARB() stubs.
2003-05-28 14:26:03 +00:00
Brian Paul
2c5f93784e Version defines. include "version.h" in a few files. 2003-05-27 21:24:40 +00:00
Brian Paul
8750668ad7 check buffer->UseSoftware*Buffer in _mesa_free_framebuffer_data() 2003-05-27 15:20:43 +00:00
Brian Paul
a3793214e9 a couple casts (Evgeny Kotsuba) 2003-05-26 14:37:54 +00:00
Keith Whitwell
27358a24a0 move LoadYUVImage into readtex.c 2003-05-20 09:54:58 +00:00
Keith Whitwell
eea72ff722 Test programs for ycbcr extension 2003-05-20 08:50:02 +00:00
Brian Paul
0421ce4b46 autoconf/automake updated for newer versions (bug 734362) 2003-05-15 14:04:27 +00:00
Brian Paul
12f8fb6084 added a couple casts 2003-05-15 13:38:24 +00:00
Brian Paul
06a03bfb2a updated with new glext.h stuff 2003-05-10 04:48:16 +00:00
Brian Paul
3ef8ed72ca version 18 of glext.h 2003-05-10 04:39:05 +00:00
Brian Paul
b93df0af47 remove temporary stuff 2003-05-10 04:38:24 +00:00
Brian Paul
e591ad7350 added GL_ARB_vertex_program functions 2003-05-10 04:37:47 +00:00
Brian Paul
0295088118 initialize condition codes before running program 2003-05-10 04:37:24 +00:00
Brian Paul
3fdb8fbfc5 fix scalar literal parsing glitches 2003-05-10 04:36:11 +00:00
Brian Paul
ea31ca4720 fix MapBufferARB() return type 2003-05-10 04:35:09 +00:00
Brian Paul
baa42c3364 clamp fog color 2003-05-10 04:34:15 +00:00
Brian Paul
a96d596be9 added comment about MAX_WIDTH and textures 2003-05-08 16:00:45 +00:00
Brian Paul
6636a61418 fixed delete statement (bug 721765) 2003-05-08 15:47:00 +00:00
Brian Paul
7357f20b1e minor updates 2003-05-02 15:05:02 +00:00
Brian Paul
c784d87b0f updates from Ian 2003-05-02 15:04:20 +00:00
Brian Paul
e53aa5022f more docs (Klaus Niederkruger) 2003-05-01 22:45:57 +00:00
Brian Paul
92f9785c72 Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.
Misc vertex array / vertex program changes.
2003-05-01 22:44:02 +00:00
Brian Paul
09b00c5ded Ian's buffer swap extensions 2003-05-01 19:12:23 +00:00
Brian Paul
1a8d64e6e9 change global_grid_u0/u1 to REAL (Eric Cazeaux) 2003-04-30 15:20:37 +00:00
Brian Paul
5329d0ca7a updated for glIsBufferARB 2003-04-29 22:20:36 +00:00
Brian Paul
f34de59b3e don't try to clear non-existant buffers 2003-04-29 13:16:37 +00:00
Jouk Jansen
370d7ad007 Committing in .
Updating OpenVMS compile support

 Modified Files:
 	Mesa/src/descrip.mms Mesa/xdemos/glxgears.c
 ----------------------------------------------------------------------
2003-04-29 07:15:48 +00:00
Brian Paul
9e3a7cd6dd LOG2() clean-up (Klaus Niederkrueger) 2003-04-28 15:24:17 +00:00
Brian Paul
c8f2f456f9 new comments (Klaus Niederkruger) 2003-04-28 14:56:24 +00:00
Brian Paul
c6506004d4 fix glIsBufferARB() prototype 2003-04-28 14:42:33 +00:00
Brian Paul
3e50d140f5 updated with newest functions 2003-04-23 20:23:17 +00:00
Brian Paul
e78f823724 fix function prototypes for manging (Bill Hoffman) 2003-04-23 17:42:07 +00:00
Brian Paul
a83b4b1f2c remove unneeded fragment program test 2003-04-21 15:05:20 +00:00
Brian Paul
464bc3b674 remove unneeded unsigned int / zero comparisons 2003-04-21 15:04:30 +00:00
Brian Paul
7bb832f9f7 fix DDX, DDY instructions (probably not finished though) 2003-04-21 15:03:46 +00:00
Brian Paul
e5b244ff7f Implemented GL_EXT_depth_bounds_test. 2003-04-21 15:02:17 +00:00
Brian Paul
2780bb824f added GL_EXT_depth_bounds_test 2003-04-21 14:57:07 +00:00
Brian Paul
b0b9b798ac alias ARB/NV program functions where possible 2003-04-21 14:53:40 +00:00
Brian Paul
e4eae45512 silence warning 2003-04-21 14:52:32 +00:00
Brian Paul
8eb2fe0e15 added a cast 2003-04-21 14:51:49 +00:00
Brian Paul
d93b68f17a silence warnings 2003-04-21 14:51:16 +00:00
Brian Paul
ff389b00a5 casts 2003-04-21 14:50:49 +00:00
Brian Paul
95210bc806 fix minor warnings 2003-04-21 14:50:12 +00:00
Brian Paul
e5db876329 use INDEX8_SPAN_ARGS 2003-04-21 14:06:01 +00:00
Brian Paul
a0ef56fd15 fix .c / .h typo 2003-04-21 14:04:27 +00:00
Brian Paul
edd677454d minor re-org of program matrix, program local parameter limits 2003-04-18 18:02:43 +00:00
Brian Paul
9b14e0fbfd more GL_ARB_fragment_program tokens 2003-04-18 01:56:44 +00:00
Brian Paul
77eec61e21 more GL_ARB_vertex/fragment_program bits 2003-04-18 01:56:11 +00:00
Brian Paul
5e92a7c745 fix some glBindProgramNV/ARB details 2003-04-17 23:14:30 +00:00
Brian Paul
3ca3ab0cd1 clean up usage of extension function pointers 2003-04-17 21:43:55 +00:00
Brian Paul
24339179a4 Demo of using GL_ARB_vertex/fragment_program to do per-pixel lighting. 2003-04-17 19:20:54 +00:00
Brian Paul
da74a60e4c added LoadProgramNV and RequestResidentProgramsNV 2003-04-17 02:44:13 +00:00
Brian Paul
5960105ca3 Added arbprogram.c to Makefiles.
Added display list support for GL_NV_fragment_program.
Assorted clean-ups.
2003-04-17 02:33:08 +00:00
Brian Paul
af0c247021 temporary GL_ARB_fragment_program tokens 2003-04-17 01:48:56 +00:00
Brian Paul
451f31093e checkpoint: more infrastructure for GL_ARB_vertex/fragment_program. 2003-04-17 01:48:19 +00:00
Brian Paul
2db8041ffe fix depth texture tex env bug (#719903) 2003-04-14 17:08:53 +00:00
Brian Paul
d0492cf137 Some groundwork for GL_ARB_vertex/fragment_program. 2003-04-11 01:20:06 +00:00
Brian Paul
6cfaff1633 remove a const 2003-04-10 19:57:19 +00:00
Keith Whitwell
bf7128a682 drawarrayrange fix 2003-04-10 10:03:30 +00:00
Brian Paul
ebab631c9c fix typo 2003-04-09 22:50:52 +00:00
Brian Paul
0b77a1c635 fix typo 2003-04-09 21:50:08 +00:00
Brian Paul
ad80233d5d add support for swap and sync extensions (Ian Romanick) 2003-04-09 21:47:19 +00:00
Brian Paul
4c928471c1 Added function pointer typedefs for GL_NV_fragment_program 2003-04-09 02:32:56 +00:00
Brian Paul
ef393cbb54 Added GL_ARB_vertex_buffer_object tokens 2003-04-09 02:32:12 +00:00
Brian Paul
aac732546a basic work on GL_ARB_vertex_buffer_object 2003-04-09 02:31:35 +00:00
Brian Paul
c708ac2afe fix string compare bug 2003-04-08 18:02:27 +00:00
Brian Paul
38c619bf15 add missing return in raster_pos4f() 2003-04-08 13:33:41 +00:00
Brian Paul
dcf3d8d61d fix some problems parsing scalar source arguments 2003-04-08 02:57:36 +00:00
Brian Paul
36a0a3252e Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
2003-04-08 02:27:16 +00:00
Brian Paul
0cebd5822a added _mesa_realloc() 2003-04-08 02:22:41 +00:00
Brian Paul
b8ca0172e7 scalar source reg can be a scalar or vector literal 2003-04-07 23:12:00 +00:00
Brian Paul
071a4ddd92 initialize attribute vectors to 4 components 2003-04-07 23:07:50 +00:00
Brian Paul
4cef881e1f Demo of per-pixel lighting with a fragment program. 2003-04-07 23:05:50 +00:00
Brian Paul
14995b3d3b minor parser fixes, program print-out fixes 2003-04-07 14:58:58 +00:00
Brian Paul
670c8780f7 fix typo 2003-04-07 14:57:27 +00:00
Brian Paul
0e7f2952fe fix color array mixup 2003-04-07 14:54:01 +00:00
Keith Whitwell
e3dd0a4e7f Don't unset FLUSH_STORED_VERTICES in _tnl_execute_cassette as this may
break driver callbacks.
2003-04-07 14:53:28 +00:00
Brian Paul
69ffa43656 Added gcc-sl target and shared lib shell script (Philip Brown) 2003-04-07 14:45:52 +00:00
Keith Whitwell
33ce405e86 Pass 4th element correctly in loopback_VertexAttrib4svNV 2003-04-05 07:29:23 +00:00
Brian Paul
c0eebd723f test glProgramNamedParameter4fNV() 2003-04-05 00:38:40 +00:00
Brian Paul
ce7f006e66 fragment program named constants and named program parameters basically work now 2003-04-05 00:38:09 +00:00
Brian Paul
738318bb75 Rework gl[Copy]Tex[Sub]Image() error checking so that all level, width, height
and depth checks are done via ctx->Driver.TestProxyTexImage().  This allows
more flexiblity, like supporting larger, non-cubic 3D textures.
2003-04-04 17:17:50 +00:00
Brian Paul
b0e90cc839 more memory-related fixes 2003-04-03 21:01:33 +00:00
Brian Paul
7823388744 some texture compression odds & ends 2003-04-03 20:57:49 +00:00
Brian Paul
bb5ebf1724 simplify CEILF, FLOORF, FABSF stuff 2003-04-03 20:34:38 +00:00
Brian Paul
0983163fde fix double-memory free in XMesaDestroyContext 2003-04-02 19:34:36 +00:00
Brian Paul
27f4484fb7 added GL_PROXY_TEXTURE_RECTANGLE_NV to is_proxy_target() 2003-04-01 22:23:11 +00:00
Brian Paul
dd26d02889 clean-up current state initialization 2003-04-01 22:20:42 +00:00
Brian Paul
12fca20e1f added GL_FRAGMENT_PROGRAM_NV (Alan Matsuoka) 2003-04-01 19:07:35 +00:00
Brian Paul
b852f048ee minor initialization fixes 2003-04-01 18:57:36 +00:00
Brian Paul
8d7a2504c3 improve some error messages 2003-04-01 18:56:30 +00:00
Brian Paul
4b28b5a885 GL_SECONDARY_COLOR_ARRAY_SIZE_EXT query was returning stride 2003-04-01 18:27:07 +00:00
Brian Paul
97bc3d7e78 GL_FOG_COORDINATE_SOURCE_EXT query was missing 2003-04-01 18:22:23 +00:00
Brian Paul
525f04389f fix GL_LIST_MODE, GL_CURRENT_MATRIX_STACK_DEPTH_NV and GL_CURRENT_MATRIX_NV queries 2003-04-01 18:16:33 +00:00
Brian Paul
f0805670a1 fix default compare mode 2003-04-01 18:10:10 +00:00
Brian Paul
6fafc7ad19 s/gl_ctx/mesa/ and misc clean-ups 2003-04-01 17:28:55 +00:00
Brian Paul
1e24d3318d use structure containment to derive xmesa_context from GLcontext 2003-04-01 17:28:10 +00:00
Brian Paul
a3f137094c New device driver hooks for texture object and texture image creation to
allow drivers to implement C++-like inheritance via containment.
Lots of assorted clean-ups related to texture objects.
2003-04-01 16:41:50 +00:00
Brian Paul
926c34f894 comments 2003-04-01 16:39:25 +00:00
Brian Paul
e9f4ee87d8 _mesa_realloc() fix 2003-04-01 16:17:03 +00:00
Brian Paul
8412c60451 added gnumake/gmake info 2003-04-01 15:33:08 +00:00
Jouk Jansen
b8b50cc5c4 Committing in .
added bufferobj.obj

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2003-04-01 13:43:41 +00:00
Brian Paul
dc27b33fb4 Remove dead code.
Replace blocks of per-attribute code with for-loops.
New comments/docs.
2003-03-31 23:47:31 +00:00
Brian Paul
d78c57e8b5 clean-ups, const qualifiers 2003-03-31 23:08:59 +00:00
Brian Paul
6045b0501d minor clean-ups, const qualifiers 2003-03-31 23:06:50 +00:00
Brian Paul
05b2651066 reduce memory needed for vertex attributes (allocate on demand) 2003-03-31 18:19:56 +00:00
Brian Paul
55b0ff2193 use gluSphere instead of glutSphere so we get texcoords 2003-03-31 16:51:38 +00:00
Brian Paul
c765d44650 fixed bad texgen Q problem 2003-03-31 16:48:35 +00:00
Brian Paul
a376e339a5 minor updates 2003-03-30 16:54:36 +00:00
Brian Paul
954a9b8885 added MD5 checksums 2003-03-30 16:45:02 +00:00
Brian Paul
bc6dfeb865 added 5.0.1 info 2003-03-30 16:20:23 +00:00
Brian Paul
871a881899 minor change 2003-03-30 16:18:30 +00:00
Brian Paul
7f223f2060 5.0.1 updates 2003-03-30 16:17:54 +00:00
Brian Paul
408722351d enable 1.4 extensions 2003-03-30 15:49:01 +00:00
Brian Paul
56fe21b3e7 remove debug printf 2003-03-29 17:09:42 +00:00
Brian Paul
1c455e4843 remove duplicate line 2003-03-29 17:07:03 +00:00
Brian Paul
6061df09a4 Basic infrastructure for GL_ARB_vertex_buffer_object. 2003-03-29 17:01:00 +00:00
Brian Paul
c13a05547d print GL_MULTISAMPLE_ARB 2003-03-29 16:42:57 +00:00
Brian Paul
c310570215 fix texgen msg strings 2003-03-29 16:40:23 +00:00
Brian Paul
9c27050e27 minor updates 2003-03-29 16:39:52 +00:00
Brian Paul
997d468afe added GL_ARB_vertex_buffer_object functions 2003-03-29 16:39:21 +00:00
Brian Paul
88e3ed2d81 disable normal xform code for now 2003-03-29 16:38:37 +00:00
Brian Paul
29af3b2be6 added _mesa_print_nv_vertex_instruction() 2003-03-29 16:38:08 +00:00
Brian Paul
52334967ed proper dispatch for NV_fragment_program functions 2003-03-29 16:37:07 +00:00
Brian Paul
c6d030a597 GL_ARB_vertex_buffer_object, GL_ARB_vertex_program, GL_NV_fragment_program entrypoints 2003-03-29 16:36:59 +00:00
Brian Paul
861a60fd40 added entries for GL_ARB_vertex_buffer_object, GL_ARB_vertex_program, GL_NV_fragment_program 2003-03-29 16:35:09 +00:00
Brian Paul
183aea64d3 DOS updates from Daniel Borca 2003-03-29 16:14:01 +00:00
Brian Paul
a8d4963fbc fix EXP instruction and ARL-relative addressing 2003-03-29 16:04:31 +00:00
Brian Paul
8856cece54 minor clean-ups, comments, etc 2003-03-28 01:39:04 +00:00
Brian Paul
98fc9b36b6 fixed ColorMask problem for front-buffer rendering 2003-03-27 17:51:33 +00:00
Brian Paul
a5607f2a04 remove some unfinished code accidently checked in 2003-03-25 02:29:46 +00:00
Brian Paul
a46bd6f96a histogram code move, remove s_histogram.[ch] from Makefiles 2003-03-25 02:26:28 +00:00
Brian Paul
45bc887da2 replace _mesa_ prefix with _swrast_, remove s_histogram.[ch] 2003-03-25 02:23:44 +00:00
Brian Paul
af1bfb7281 store correct EXP result 2003-03-25 00:00:29 +00:00
Brian Paul
6d6efd605f disable prototyped GLX_ARB_render_texture extension 2003-03-24 23:41:10 +00:00
Brian Paul
ee2b34215f add 2, not 4, in _mesa_get_compressed_formats() 2003-03-24 20:00:09 +00:00
Brian Paul
bb21846b2f subset spec (was subset.html in embedded-1-branch) 2003-03-22 18:35:53 +00:00
Brian Paul
d40f9fa0ec fix GL_COLOR_MATERIAL bug 2003-03-21 13:18:33 +00:00
Brian Paul
efe5671eef remove/obfuscate all remaining email addresses 2003-03-19 19:15:28 +00:00
Jouk Jansen
b0f347872d Committing in .
Added some type casts

 Modified Files:
 	Mesa/src/swrast/s_nvfragprog.c
 ----------------------------------------------------------------------
2003-03-19 07:15:35 +00:00
Brian Paul
4515663052 Rewrite of fragment program named parameters, constants, etc. Not done. 2003-03-19 05:34:24 +00:00
Brian Paul
762c115242 added comments 2003-03-19 05:33:09 +00:00
Keith Whitwell
aaa46798f1 Fix typo 2003-03-17 21:38:47 +00:00
Brian Paul
c6dcb0fe89 move #include glheader.h before extern C namespace 2003-03-17 15:13:43 +00:00
Brian Paul
54e92e8420 Store partial derivative values in sw_span structure.
Implemented DDX and DDY fragment program instructions (whew!)
Not fully tested yet.
2003-03-16 22:02:36 +00:00
Brian Paul
a79b55ae65 use TEX_UNIT_LOOP macro to coalesce some code 2003-03-16 20:10:01 +00:00
Brian Paul
dec3ed69e2 clean-ups, re-org in preparation for fragment program work 2003-03-16 18:42:13 +00:00
Brian Paul
b0eee79868 added -lstc++ info, convert more plain text to html 2003-03-16 16:43:04 +00:00
Brian Paul
350353adcd Fix up some fragment program texture enable issues.
Implemented TXD instruction.
2003-03-15 17:33:25 +00:00
Brian Paul
add99d01ee added fptest1, fptexture, texrect, etc 2003-03-14 15:43:46 +00:00
Brian Paul
5b8ed51501 simple NV_fragment_program texture test 2003-03-14 15:41:51 +00:00
Brian Paul
f386f73f9e Clean-up of parser error handling/reporting.
Basic fragment program texture instructions are limping along.
2003-03-14 15:40:59 +00:00
Brian Paul
a2da1155c2 include macros.h 2003-03-14 15:38:04 +00:00
Brian Paul
57ad382b8d DJGPP tweaks 2003-03-11 15:42:48 +00:00
Brian Paul
971e4d6160 DJGPP tweaks 2003-03-11 15:34:42 +00:00
Brian Paul
7954480d65 added Klaus Niederkruger, html clean-up 2003-03-10 14:01:05 +00:00
Brian Paul
24e81fda4d fix/improve glAreTextures/ProgramsResident (Jose Fonseca) 2003-03-10 00:26:24 +00:00
Brian Paul
08953c318e test GLfloat OSMesa rendering 2003-03-08 19:05:45 +00:00
Brian Paul
47d8adde43 DOS update (Daniel Borca) 2003-03-08 18:28:14 +00:00
Brian Paul
f4b21ab645 minor tweaks 2003-03-08 17:45:44 +00:00
Brian Paul
0b27aceae2 Documentation/website overhaul. The website content and doc/ directory
are now merged and are one and the same.
2003-03-08 17:38:57 +00:00
Brian Paul
dc32636cfd minor updates 2003-03-07 20:21:51 +00:00
Brian Paul
009bbccb69 added OS/2 version of IROUND (Evgeny Kotsuba) 2003-03-07 14:54:22 +00:00
Jouk Jansen
b5a56e2480 Committing in .
Removed src/mmath.c from OpenVMS makefile

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2003-03-05 15:54:56 +00:00
Brian Paul
cc9464e082 fix GLchan=GLfloat problems 2003-03-04 19:16:47 +00:00
Brian Paul
612cf792db silence a GLchan=GLfloat warning with a cast 2003-03-04 19:16:23 +00:00
Brian Paul
f9b1e5241f added _mesa_inv_sqrtf() and INV_SQRTF() (Josh Vanderhoof) 2003-03-04 16:33:53 +00:00
Brian Paul
386578c5bc disable using optimized _mesa_sqrtf() for now 2003-03-03 21:44:39 +00:00
Brian Paul
42ad8664f9 better error messages (Leif Delgass) 2003-03-03 15:37:41 +00:00
Brian Paul
078418208f added glFinish with comment 2003-03-03 03:14:25 +00:00
Brian Paul
a59ce9041d added extern "C" for C++ 2003-03-02 19:38:24 +00:00
Brian Paul
0168240c5c removed extra _mesa_memset16() prototype 2003-03-02 19:36:09 +00:00
Brian Paul
490a8b8315 remove some MESA_DEBUG stuff 2003-03-02 19:31:15 +00:00
Brian Paul
27558a160a Killed mmath.[ch]. Moved low-level functions/assembly code into imports.[ch]
Moved type conversion and interpolation macros into macros.h
Updated all the files that used to include mmath.h
2003-03-01 01:50:20 +00:00
Brian Paul
4e50ab5f70 document latest source code changes 2003-03-01 01:50:13 +00:00
Brian Paul
001a3012ac updated version 2003-02-28 16:31:32 +00:00
Brian Paul
7acd88c6d9 minor typo 2003-02-28 15:09:02 +00:00
Brian Paul
a20ed72003 fix GLchan==GLfloat bug in solve_plane_chan (bug 694546) 2003-02-28 15:08:49 +00:00
Brian Paul
13c4c046a5 fix a cast (bug 694546) 2003-02-27 23:37:53 +00:00
Karl Schultz
e9218448ca fix compilation for windows 2003-02-27 19:43:02 +00:00
Karl Schultz
65098ec9f5 fix compilation warnings on Windows 2003-02-27 19:40:45 +00:00
Karl Schultz
72baa3126b Fix function definitions for Windows. 2003-02-27 19:00:00 +00:00
Brian Paul
6a98bef961 fix float color interpolation (bug 694461) 2003-02-27 18:15:18 +00:00
Brian Paul
759c8f92e9 More clean-ups. Parse scalar/vector literals and defined identifier sources. 2003-02-26 01:28:15 +00:00
Brian Paul
730c924943 s/Parse_SwizzleSrcReg/Parse_VectorSrc/. Parse +/- and absolute value syntax. 2003-02-25 20:07:43 +00:00
Brian Paul
ec35842990 more parser test programs 2003-02-25 20:06:35 +00:00
Brian Paul
9f4d812aa7 set MAX_NV_FRAGMENT_PROGRAM_OUTPUTS to 3 2003-02-25 19:30:59 +00:00
Brian Paul
f9ff2657c4 assorted clean-ups and improvements 2003-02-25 19:30:27 +00:00
Brian Paul
8488c9f3cb pass the instruction to store_vector4(). implement KIL. 2003-02-25 19:29:43 +00:00
Brian Paul
1bdc52f86e parser clean-ups and simplifications 2003-02-25 19:27:54 +00:00
Brian Paul
adb1a2911a move matrix type enum out of GLmatrix struct 2003-02-25 19:27:06 +00:00
Brian Paul
a10be7fb85 fix-up pixel_format enum stuff 2003-02-25 19:26:30 +00:00
Brian Paul
4039cb8ca8 casts to silence g++ warnings 2003-02-25 19:25:52 +00:00
Brian Paul
b10c434a8f use _mesa_find_line_column() 2003-02-23 05:25:16 +00:00
Brian Paul
d804fd1f4d parser clean-ups (use struct parse_state) 2003-02-23 05:24:39 +00:00
Brian Paul
25fea6be0a added _mesa_find_line_column() 2003-02-23 05:23:53 +00:00
Brian Paul
736d10c274 silence warning with a cast 2003-02-23 04:23:43 +00:00
Brian Paul
25060c1f29 test if active texture is really changed in _mesa_ActiveTexture() 2003-02-23 04:12:57 +00:00
Brian Paul
b8d6607acd Move span stuff from swrast.h to s_context.h (it's private).
Implemented remaining fragment program instructions.
Initial changes to implement fragment program texture sampling.
2003-02-23 04:10:54 +00:00
Brian Paul
4e44d8c4c6 parser clean-ups 2003-02-23 04:09:21 +00:00
Brian Paul
14e6bbccff added TEXTURE_*_INDEX tokens 2003-02-23 04:07:28 +00:00
Brian Paul
3a4231e132 use IROUND to convert depth values from float to int (bug 690728) 2003-02-21 21:00:20 +00:00
Brian Paul
ea20dfa7a8 fix zoom/clipping bug 689964 2003-02-21 00:17:58 +00:00
Brian Paul
19b3b0a0ff updated DOS files for tarball 2003-02-20 15:53:38 +00:00
Brian Paul
60f84fcc91 latest DOS updates (Daniel Borca) 2003-02-20 15:43:52 +00:00
Brian Paul
449e47f06a Replace some #defines with enums. (Klaus Niederkrueger) 2003-02-17 16:35:56 +00:00
Brian Paul
85109b063c fixed bad zoomed.zStep assignment (bug 687811) 2003-02-17 15:41:05 +00:00
Brian Paul
04cbad84e8 Implement parsing of texture instructions and prototype execution.
Misc parser clean-ups.
2003-02-17 15:38:03 +00:00
Brian Paul
2c1912fe84 more work on DEFINE/DECLARATION statements, symbol tables 2003-02-16 23:07:34 +00:00
Brian Paul
a89cc0edad version bumps, etc 2003-02-13 16:01:33 +00:00
Brian Paul
f2f5f4f884 replace APIENTRY with GLUTAPIENTRY to be consistant with glut.h 2003-02-12 23:56:21 +00:00
Brian Paul
095f59a303 added OS/2 includes 2003-02-12 16:04:07 +00:00
Alan Hourihane
e07618fb57 cast GLfloat 2003-02-10 20:31:11 +00:00
Alan Hourihane
615991ac66 fix fragment_program for Windows 2003-02-10 20:22:08 +00:00
Brian Paul
a4a5da745b added rules for making bz2 files and md5 checksums 2003-02-08 22:09:04 +00:00
Brian Paul
b6b39455e3 added cvsclean target 2003-02-08 16:23:44 +00:00
Brian Paul
92d7935074 replace _mesa_strtof() with _mesa_strtod() 2003-02-08 15:56:34 +00:00
Brian Paul
b8e3eb95d0 disable normal xform code - see bug 673938 2003-02-08 15:43:39 +00:00
Brian Paul
c8e28650c9 fix assertion in transfer_teximage() (Laurent Desnogues) 2003-02-06 13:50:57 +00:00
Brian Paul
7d0522e16a replace | with & (Laurent Desnogues) 2003-02-06 13:44:55 +00:00
Brian Paul
66dce0875e fix bug in popping texture color table state 2003-02-05 15:24:28 +00:00
Brian Paul
6cf845f338 added a comment for _tnl_need_projected_coords() 2003-02-04 14:40:56 +00:00
Brian Paul
dd5f1f43ac Use 'ndc' instead of 'proj' terminology.
Added a bunch of const qualifiers.
2003-02-04 14:40:02 +00:00
Brian Paul
e5ed2f07d8 read/write files, not stdio (Daniel Borca) 2003-02-04 12:34:02 +00:00
Brian Paul
398c6b7980 DOS updates (Daniel Borca) 2003-02-04 02:43:27 +00:00
Brian Paul
657a9d64d7 unneeded (Daniel Borca) 2003-02-04 02:41:25 +00:00
Brian Paul
95e67dc99d use ARB flavor of window_pos extension 2003-02-04 02:35:00 +00:00
Brian Paul
3d7071b8a5 updated with new functions (Bill Hoffman) 2003-02-04 02:29:21 +00:00
Brian Paul
c0f1a69a96 print debug message when SSE is disabled by user (Klaus Neiderkrueger) 2003-02-04 02:22:51 +00:00
Brian Paul
4f615d7fa3 update version numbers (Klaus Niederkrueger) 2003-02-04 02:21:50 +00:00
Karl Schultz
839bef921c Check only LEFT bits for clearing alpha buffer. (Evgeny Kotsuba) 2003-01-30 15:47:06 +00:00
Brian Paul
4c3bb69a94 fix reported 3Dnow bug in _mesa_normal_tab (Felix Kuhling) 2003-01-30 14:30:24 +00:00
Brian Paul
5c31f8678b fix prefetch bug (Felix Kuhling) 2003-01-28 22:41:18 +00:00
Brian Paul
35d03a6b3e updated version test 2003-01-28 15:31:35 +00:00
Brian Paul
02de45dced move ltor computation 2003-01-28 00:14:32 +00:00
Brian Paul
f4418f4d1c some casts (Evgeny Kotsuba) 2003-01-28 00:10:41 +00:00
Brian Paul
45b47d079f Make GL_SGI_texture_color_table work per-texture unit.
Clean-up and optimize _swrast_texture_table_lookup().
2003-01-26 14:37:15 +00:00
Brian Paul
7cac85d00a remove bad assertion, fix minor bug in _mesa_lookup_rgba() 2003-01-26 14:34:56 +00:00
Brian Paul
9067c26e5d optimize compute_coveragef (Evgeny Kotsuba) 2003-01-25 18:57:13 +00:00
Brian Paul
9d169138d0 new texture enums (Leif Delgass) 2003-01-25 00:46:46 +00:00
Brian Paul
b7209b54f7 remove unused vars 2003-01-24 21:42:27 +00:00
Brian Paul
388781a526 silence warning 2003-01-24 21:41:08 +00:00
Brian Paul
b3f717037d silence some warnings 2003-01-24 21:38:19 +00:00
Brian Paul
d737ad5272 renamed dither-related preprocessor symbols (bug 536406) 2003-01-24 15:33:22 +00:00
Brian Paul
a7c52c61e5 push/pop color table state (Eric Plante) 2003-01-22 17:58:52 +00:00
Brian Paul
a2473160d4 improved solve_plane_chan() (Evgeny Kotsuba) 2003-01-22 15:03:09 +00:00
Brian Paul
7ab14f00f0 glGet(GL_CURRENT_SECONDARY_COLOR) should return 4 values, not 3 2003-01-22 00:42:45 +00:00
Brian Paul
041d5d3aee added missing break (Leif Delgass) 2003-01-21 23:58:29 +00:00
Brian Paul
ccec647f1c GL_SGI_texture_color_table 2003-01-21 21:48:29 +00:00
Brian Paul
418ac00e75 GL_SGI_texture_color_table extension (Eric Plante) 2003-01-21 21:47:45 +00:00
Brian Paul
068a4812fc new X86 CPU detection code (Petr Sebor) 2003-01-21 16:13:55 +00:00
Brian Paul
943f0c6a41 GL_ATI_texture_env_combine3 extension 2003-01-21 15:49:06 +00:00
Brian Paul
19ad3fee8c check for NV_fragment_program for glGetString(GL_PROGRAM_ERROR_STRING_NV) 2003-01-21 15:45:39 +00:00
Brian Paul
64b4298181 fix an assertion 2003-01-20 15:21:41 +00:00
Brian Paul
a12d12d119 use COPY_CHAN4 macro 2003-01-20 15:20:27 +00:00
Brian Paul
8f95d790da use R/G/B/ACOMP indexes (Evgeny Kotsuba) 2003-01-20 00:25:17 +00:00
Brian Paul
2e5c1dce4e fix IBM CPP warning (Evgeny Kotsuba) 2003-01-20 00:24:22 +00:00
Brian Paul
47ecdf55da add some casts 2003-01-19 15:27:37 +00:00
Alan Hourihane
5e9dd04077 fix for framebuffer width and height when window hasn't been realized. 2003-01-16 19:10:46 +00:00
Brian Paul
1596bf398c another fix for glDrawPixels + clipping 2003-01-16 18:57:44 +00:00
Brian Paul
08e1ef79cc update CurrentStack in glActiveTexture if needed (bug 669080) 2003-01-16 15:22:13 +00:00
Brian Paul
ed96f46637 fix glDrawPixels hang when clipping 2003-01-15 23:46:34 +00:00
Jouk Jansen
b6f2dd2a99 Committing in .
the latest changes were in UNIX and not VMS makefile syntax.
 changed to VMS syntax.

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2003-01-15 13:37:47 +00:00
Karl Schultz
ec4c882e47 Fix SourceForge bug 664908. wglDescribePixelFormat should return the
number of valid PFD's if the PFD pointer is NULL, without checking
the validity of the other parameters.
2003-01-15 00:34:16 +00:00
Brian Paul
4fc647c397 simple GL_NV_fragment_program test 2003-01-14 22:50:02 +00:00
Brian Paul
890bcc0be3 fragment program execution 2003-01-14 04:57:47 +00:00
Brian Paul
610d59981a First batch of code for GL_NV_fragment_program.
Re-org of some GL_NV_vertex_program code.
Replace MAX_TEXTURE_UNITS with MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.
2003-01-14 04:55:45 +00:00
Brian Paul
cf01d97dc3 GL_NV_fragment_program 2003-01-14 04:50:14 +00:00
Brian Paul
e58286ccb6 prototype render-to-texture 2003-01-14 04:49:31 +00:00
Brian Paul
3c5bfac63b initial code for render-to-texture 2003-01-14 04:49:07 +00:00
Brian Paul
e1e446bf77 remove const from _mesa_strtof() 2003-01-14 03:05:38 +00:00
Brian Paul
44257dacc0 added _mesa_strtof() 2003-01-14 03:02:13 +00:00
Brian Paul
4097ea012a OSMesa16 updates (Eric Plante), added _mesa_strtof() 2003-01-14 03:00:54 +00:00
Brian Paul
dad19f51c3 fix fog stride bugs (Michel Danzer) 2003-01-13 15:47:52 +00:00
Brian Paul
ce352387fb remove ADD_L altogether 2003-01-09 23:43:02 +00:00
Brian Paul
e27f5e5254 s/16/32/ (Josh Vanderhoof) 2003-01-09 18:03:20 +00:00
Brian Paul
25e38ce9e5 moved ADD_L instruction (Linus Torvalds) 2003-01-09 14:56:25 +00:00
Brian Paul
9108b29dbf added font-related symbols 2003-01-09 14:36:54 +00:00
Brian Paul
e772bee10b fix some float/ubyte mistakes (Daniel Borca) 2003-01-08 21:32:33 +00:00
Brian Paul
ff9ef3baed move t->Image[i]->Format test (bug 659012) 2003-01-08 16:48:04 +00:00
Brian Paul
1e091f48f0 fix typo in rotation code (bug 659677) 2003-01-08 16:42:47 +00:00
Brian Paul
fa268adc9d fix glCopyTexSubImage2D error checking (bug 661907) 2003-01-08 16:24:05 +00:00
Alan Hourihane
95249b2d18 Check that ActiveTextureARB doesn't overflow MaxTextureUnits 2002-12-30 19:24:05 +00:00
Keith Whitwell
0070285b32 Add missing break statements 2002-12-19 18:36:01 +00:00
Brian Paul
518b6f44b4 added new DOS files 2002-12-19 15:18:22 +00:00
Brian Paul
10d2259baa obsolete 2002-12-19 15:15:24 +00:00
Brian Paul
2df7cd4f0c DOS updates 2002-12-19 15:14:58 +00:00
Brian Paul
03516d9efa DOS updates from Daniel Borca. 2002-12-18 15:06:36 +00:00
Brian Paul
c0fc0d4e5f comment changes 2002-12-18 15:02:19 +00:00
Brian Paul
866023da66 improved error message 2002-12-18 15:01:26 +00:00
Brian Paul
7c0e32bbf0 added RELNOTES-5.1 file 2002-12-18 14:57:34 +00:00
Brian Paul
7956321bf1 bug fixes 2002-12-18 14:56:59 +00:00
Keith Whitwell
e15fd85727 Add mechanism to destroy mutexes. Important on OS's where mutex initialization
allocates memory (like FreeBSD).
2002-12-12 13:03:15 +00:00
Brian Paul
76d2a77291 use/test GL_SGIS_generate_mipmaps if available 2002-12-10 16:51:28 +00:00
Brian Paul
6f458650bf let _mesa_problem() take variable arguments 2002-12-06 03:10:59 +00:00
Keith Whitwell
46b99c9016 Don't crash if End received without a Begin... 2002-12-05 11:49:46 +00:00
Brian Paul
6cb5b3475d added _mesa_print_texunit_state() for debugging 2002-12-05 04:51:57 +00:00
Brian Paul
93e0ba8b80 properly handle very wide images 2002-12-05 04:48:53 +00:00
Brian Paul
6e179ad9ef clean-ups, comments 2002-12-05 04:46:54 +00:00
Brian Paul
91e98cd153 fix bad _mesa_printf() calls (mesa bug 646753) 2002-12-04 14:24:44 +00:00
Brian Paul
66fa33e576 updated to use ARB extensions 2002-12-03 03:13:17 +00:00
Brian Paul
2a7243481a added GL_DEPTH_COMPONENT to two assertions 2002-12-03 00:05:48 +00:00
Brian Paul
e7cf569475 declar vsnprintf for OS/2 and VMS (Evgeny Kotsuba) 2002-12-01 13:59:11 +00:00
Brian Paul
d37363d4c0 added const to casts 2002-11-30 17:18:46 +00:00
Brian Paul
2569c3c744 remove GLUTAPIENTRY from __glutCloseDownGameMode 2002-11-30 17:04:04 +00:00
Brian Paul
0f8daaf670 mask is always non-null in write_rgba_pixels and write_monorgba_pixels 2002-11-28 15:56:06 +00:00
Brian Paul
1b94df053d use polygon offset to avoid multi-pass Z-fighting artifacts 2002-11-28 15:51:55 +00:00
Brian Paul
957a0cdb13 added missing call to _mesa_write_mono_alpha_span() 2002-11-26 03:00:04 +00:00
Brian Paul
f345c61a59 fixed bad clear value 2002-11-26 02:58:43 +00:00
Brian Paul
a87514f58e added missing ctx parameter to _tnl_flush_immediate() calls 2002-11-25 20:27:47 +00:00
Brian Paul
3ac375b174 set default texcoords for glBitmap/glDrawPixels 2002-11-25 20:26:59 +00:00
Keith Whitwell
e44bf40402 Flush IM if very small number of verts left -- prevent copy errors 2002-11-25 13:55:31 +00:00
Brian Paul
3ac8105e9c fixed cube texture auto-mipmap generation bug (641363) 2002-11-20 21:39:39 +00:00
Brian Paul
3a212032e7 put FEATURE_NV_vertex_program around vpstate.h include 2002-11-19 15:25:00 +00:00
Brian Paul
d6113fc20d bring in a few AGP-related bits from 4.0.4 2002-11-18 15:11:49 +00:00
Brian Paul
a8f002f4f4 enable 1.4 extensions 2002-11-18 14:45:14 +00:00
Brian Paul
1fe3b1d964 more clean-ups 2002-11-15 15:05:04 +00:00
Brian Paul
69e3c8b323 bump version to 5.1 2002-11-14 16:14:50 +00:00
Brian Paul
22a47c5251 Overhaul of line drawing template code. Make better use of sw_span mechanism. 2002-11-14 03:48:03 +00:00
Brian Paul
4839824587 fix compilation problem (Philippe Houdoin) 2002-11-13 22:22:20 +00:00
Karl Schultz
1b260aee24 Add _mesa_enable_1_4_extensions and _mesa_problem 2002-11-13 20:59:07 +00:00
Brian Paul
9c799cdc49 Lots of clean-ups.
Use new s_spantemp.h to generate all the span functions.
Updated triangle functions (#define NAME, etc)
2002-11-13 16:57:44 +00:00
Brian Paul
b4497c5843 template code for span functions for flat, memory-based frame buffers 2002-11-13 16:54:01 +00:00
Brian Paul
cdf2da368d moved function declaration into the template, define the NAME to specify the function names 2002-11-13 16:51:01 +00:00
Brian Paul
36723b6538 check for NULL span argument 2002-11-13 16:48:47 +00:00
Brian Paul
e21a79bfdd added comments about NULL mask parameter to span-write functions 2002-11-13 16:47:18 +00:00
Brian Paul
4d7a1289ed optimized color buffer clear fallback (use mono-color span functions 2002-11-13 16:46:19 +00:00
Brian Paul
9d88c7d8f4 last tweaks for 5.0 release 2002-11-13 15:33:50 +00:00
Brian Paul
21709b354b init facing to zero 2002-11-13 15:04:29 +00:00
Brian Paul
62d821786c include imports.h 2002-11-13 15:03:31 +00:00
Brian Paul
101b16cf41 minor update 2002-11-13 03:08:15 +00:00
Brian Paul
069ad023b5 omit dmesadxe.h from tar file 2002-11-13 02:34:53 +00:00
Brian Paul
43cb96cbf6 html index to doc files, doxygen files 2002-11-13 02:28:20 +00:00
Brian Paul
1e9d43f56c latest 5.0 bug fixes 2002-11-12 19:32:09 +00:00
Brian Paul
7069a7e3d6 apply scale factor before clapping for DOT3 2002-11-12 19:27:24 +00:00
Brian Paul
d5cbe1e924 removed -malign-jumps 2002-11-12 02:49:14 +00:00
Karl Schultz
d8c6273cf6 Tweaks for hpux. The hpux10 and hpux10-sl targets now build pretty
cleanly.
2002-11-11 18:56:36 +00:00
Brian Paul
68b1d5c315 compilation fixes 2002-11-11 18:42:38 +00:00
Brian Paul
f104619b8f changes to vishandle usage to prevent segfault in some circumstances 2002-11-10 17:07:06 +00:00
Brian Paul
04cf6f4958 added Z calculation fix 2002-11-09 21:29:08 +00:00
Brian Paul
ad8cd6111e fix float->int Z calculation in _mesa_span_default_z() 2002-11-09 21:28:41 +00:00
Brian Paul
e307931314 fix one-bit error in float->int Z calculation 2002-11-09 21:26:41 +00:00
Brian Paul
2dee6187e4 added P4 / 3DNow bug fix 2002-11-09 20:41:13 +00:00
Keith Whitwell
b6d90e50ea fix 3dnow misdetection on new p4's 2002-11-09 17:43:58 +00:00
Brian Paul
aa80f05484 multisample / polygon smooth test 2002-11-08 18:30:26 +00:00
Karl Schultz
af76b4280c Add instructions to unzip both zip files into the same directory. 2002-11-08 18:00:04 +00:00
Brian Paul
456bc69ac4 declare tempI as Int, not Real (Jon Perry) 2002-11-08 17:38:13 +00:00
Brian Paul
872c9baf00 fixed active stencil face query 2002-11-08 15:51:17 +00:00
Brian Paul
0b0245c160 minor clean-up 2002-11-08 15:49:31 +00:00
Brian Paul
2c9e7ae38b fixed active stencil face query bug 2002-11-08 15:39:58 +00:00
Brian Paul
7a4a6a3c4c fixed a few category lines 2002-11-08 15:38:48 +00:00
Brian Paul
d1efbf0456 implemented automatic code gen and individual function validation 2002-11-08 15:35:46 +00:00
Brian Paul
6e40539490 added a few more missing 1.4 entrypoints 2002-11-07 16:37:12 +00:00
Brian Paul
7348df5937 added glBlendFuncSeparate, glMultiDrawArrays, glMultiDrawElements 2002-11-07 16:34:58 +00:00
Brian Paul
c542351085 added glFogCoord functions 2002-11-07 16:24:27 +00:00
Brian Paul
1cfae1adb2 added 1.4 functions 2002-11-07 16:23:40 +00:00
Brian Paul
42ace1c150 added missing 1.4 glFogCoord functions 2002-11-07 16:20:20 +00:00
Brian Paul
cf1c860a34 surround fixedEdges decl by #ifndef NDEBUG / #endif 2002-11-07 14:17:05 +00:00
Brian Paul
8bfc9d71aa restored fixedEdges var (for VMS) 2002-11-06 16:09:04 +00:00
Brian Paul
36b9b0e9d1 latest 5.0 bug fixes 2002-11-06 15:18:26 +00:00
Brian Paul
f48216ad0f a few dispatch pointers weren't set (glGenTexturesEXT for example) 2002-11-06 15:16:23 +00:00
Jouk Jansen
0d88328c7e Committing in .
OpenVMS issues

 Modified Files:
 	Mesa/si-glu/mesaglu.opt Mesa/src/mmath.h
 ----------------------------------------------------------------------
2002-11-06 13:39:23 +00:00
Brian Paul
66ab727101 minor multi-sample clean-ups 2002-11-05 21:11:18 +00:00
Brian Paul
25af66a67f added some printfs to show current polygon mode and cull state 2002-11-05 20:59:16 +00:00
Brian Paul
aca31cf6de fixed glTexParameteriv(GL_TEXTURE_BORDER_COLOR) error 2002-11-05 20:58:37 +00:00
Brian Paul
c4b40cc404 added GLUT and DOS updates 2002-11-05 20:53:42 +00:00
Brian Paul
aa3029bce1 Updates for DOS driver from Daniel Borca. 2002-11-05 20:52:07 +00:00
Brian Paul
8a738db519 support for GLX_ARB_multisample 2002-11-04 22:20:28 +00:00
Brian Paul
4b01eb6e08 minor revision to 4.1 features 2002-11-04 20:31:55 +00:00
Brian Paul
7d4d41a984 FX driver fixes 2002-11-04 20:31:09 +00:00
Brian Paul
8115e29ddc misc driver updates (Daniel Borca) 2002-11-04 20:29:04 +00:00
Brian Paul
df45a985ed glxinfo update 2002-11-04 16:25:42 +00:00
Brian Paul
d2e39bb050 add support for GLX_ARB_multisample 2002-11-04 16:24:18 +00:00
Brian Paul
969e1ac233 fix for HPUX 2002-11-01 23:49:59 +00:00
Brian Paul
772752449d HPUX fixes 2002-11-01 23:46:53 +00:00
Brian Paul
a85fae9cb0 silence a bunch of warnings 2002-11-01 23:45:30 +00:00
Brian Paul
034e8641bb renamed abs() function glu_abs() 2002-11-01 23:35:07 +00:00
Brian Paul
026b40f416 fix a typo 2002-11-01 17:42:03 +00:00
Brian Paul
561e6723cf list bug fixes in 5.0 2002-10-31 17:19:03 +00:00
Brian Paul
e89f0792eb tweak pipeline flags for vertex programming 2002-10-31 17:14:37 +00:00
Brian Paul
e0e6bd7ae1 fix the occasional missing triangle bug 2002-10-31 17:14:16 +00:00
Brian Paul
36481524ba simple GL_EXT_stencil_wrap test program 2002-10-31 15:25:07 +00:00
Brian Paul
07624e347b fix a few HPUX problems 2002-10-31 14:58:36 +00:00
Keith Whitwell
9627ed0631 Add a note about window map behaviour and the autotuning of nr of loops which
can conspire to make it look like clearspd is exposing an intermittent driver
bug...
2002-10-31 12:38:32 +00:00
Brian Paul
8d43976858 added a comment about future work 2002-10-30 20:40:46 +00:00
Brian Paul
9167d04dea s/getenv/_mesa_getenv/ 2002-10-30 20:25:15 +00:00
Brian Paul
2ad5921cf3 use wrappers from imports.h rather than stdio, stdlib, etc functions. 2002-10-30 20:24:45 +00:00
Brian Paul
e1e867c3b2 remove some stray debug/abort code 2002-10-30 20:18:38 +00:00
Brian Paul
4663bd50f1 don't call abort() 2002-10-30 20:16:43 +00:00
Brian Paul
68a7ee5cbb s/printf/_mesa_printf/ 2002-10-30 19:59:33 +00:00
Brian Paul
36b518a7ca s/sprintf/_mesa_sprintf/ 2002-10-30 19:58:58 +00:00
Brian Paul
f16a66e97d remove debug printf 2002-10-30 19:57:21 +00:00
Brian Paul
6ec6b845fd s/BZERO/_mesa_bzero/ 2002-10-30 19:49:29 +00:00
Brian Paul
9dc11a3e38 test both XFree86LOADER and IN_MODULE to see if we're being built as the glx module 2002-10-30 19:44:41 +00:00
Brian Paul
c5934054f3 fix potential bug in _mesa_align_calloc/malloc (Frank van Heesch) 2002-10-30 19:40:20 +00:00
Brian Paul
3160edec33 more version bumps 2002-10-29 23:53:22 +00:00
Brian Paul
b2289a944e minor updates 2002-10-29 23:42:48 +00:00
Brian Paul
42649700e2 bump OpenGL version to 1.4, Mesa version to 5.0 2002-10-29 23:09:37 +00:00
Brian Paul
ebe0b30c3e preparation for 5.0 release 2002-10-29 22:42:04 +00:00
Brian Paul
9bd8f97ea4 update versioning/extensions for OpenGL 1.4 / Mesa 5.0 2002-10-29 22:32:50 +00:00
Brian Paul
46b3f97654 fix culling problem (bug 630649) 2002-10-29 22:25:57 +00:00
Brian Paul
05a4b37707 updated email addresses 2002-10-29 20:28:36 +00:00
Brian Paul
fd062077c6 set release date 2002-10-29 15:06:37 +00:00
Brian Paul
153f15497c init a few more fields in _mesa_initialize_visual() 2002-10-29 15:04:35 +00:00
Brian Paul
dec2a4d4b7 added some casts for mallocs (bug 630379) 2002-10-29 15:03:14 +00:00
Karl Schultz
d3975341e7 Add casts to quiet compiler warnings. 2002-10-28 23:01:24 +00:00
Karl Schultz
5f1651ddc5 export new functions. 2002-10-28 23:00:50 +00:00
Brian Paul
367d308b82 wrapped a few more C library functions 2002-10-25 21:06:26 +00:00
Brian Paul
e781aec85d #include fixes 2002-10-25 18:47:56 +00:00
Brian Paul
a4f0b6884c added skybox and options to load real images 2002-10-25 17:20:26 +00:00
Brian Paul
92c195211a remove all.h, mem.h, mem.c 2002-10-25 13:50:48 +00:00
Jouk Jansen
c2836e9ac6 Committing in .
Removed src/mem.c from OpenVMS makefile

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2002-10-25 08:26:26 +00:00
Brian Paul
46458ba213 include GL/glx.h 2002-10-25 00:01:58 +00:00
Brian Paul
3c63452e64 Header file clean-up:
1. Remove all.h and PC_HEADER junk.
2. Rolled mem.c and mem.h into imports.c and imports.h
3. Include imports.h instead of mem.h
Restore _mesa_create/initialize_context() to be like they were in 4.0.4
New wrappers for a few std C functions: _mesa_atoi(), _mesa_strstr(), etc.
2002-10-24 23:57:19 +00:00
Brian Paul
d0add7cf1a added missing code to copy texrect state 2002-10-23 14:53:27 +00:00
Brian Paul
cca4dedbfd stex3d updated 2002-10-23 14:01:38 +00:00
Brian Paul
4fbdedc0d5 massive overhaul, see new keyboard options 2002-10-23 14:00:01 +00:00
Keith Whitwell
47fe2fc105 Fix projtex interp bug 2002-10-23 10:24:27 +00:00
Brian Paul
8e6926f7c3 added glDeleteTextures refcount bug fix 2002-10-22 15:17:34 +00:00
Brian Paul
e9283774dc remove debug printfs 2002-10-22 15:15:41 +00:00
Brian Paul
cf46208624 fix refcount error in _mesa_DeleteTextures (Randy Fayan) 2002-10-22 15:14:49 +00:00
Brian Paul
e6962b183d add missing texture rectangle code in _mesa_DeleteTextures() 2002-10-22 15:08:59 +00:00
Brian Paul
60b003e197 added GL_ATI_texture_mirror_once 2002-10-21 15:53:06 +00:00
Brian Paul
c7a219ec6f GL_ATI_texture_mirror_once extension (Ian Romanick) 2002-10-21 15:52:34 +00:00
Brian Paul
ac9a65b1dd doxygen comments (Klaus Niederkrueger) 2002-10-21 15:06:26 +00:00
Brian Paul
ef31f60b12 new _mesa_max_texture_levels() helper function - not used everywhere yet 2002-10-18 18:03:04 +00:00
Karl Schultz
53d30c56eb Quiet compiler warnings. 2002-10-18 17:47:35 +00:00
Brian Paul
2ce0654eba implement auto mipmap generation for compressed textures 2002-10-18 17:41:45 +00:00
Karl Schultz
8eaa290216 Add casts to quiet compiler warnings. 2002-10-18 17:02:00 +00:00
Brian Paul
6ac04f2fc6 fix bug in GL_MIRRORED_REPEAT_ARB (Ian Romanick) 2002-10-18 13:40:59 +00:00
Brian Paul
6e1ceff48b latest fixes 2002-10-18 13:28:55 +00:00
Brian Paul
e716549618 only allow intformat==GL_COLOR_INDEX if EXT_paletted_texture is supported 2002-10-18 13:24:08 +00:00
Brian Paul
8c2a1f0e4d check for GL_EXT_paletted_texture 2002-10-18 13:23:19 +00:00
Karl Schultz
798d83cf67 Add casts to quiet compiler warnings. 2002-10-17 22:26:06 +00:00
Karl Schultz
6afdc0bec2 Put back the include of windows.h so we are back to version 17 of the file. 2002-10-17 21:03:22 +00:00
Karl Schultz
3e2fa3fd5c Change for Windows only: Make demos and examples build again.
Move the inclusion of windows.h from glext.h to gl.h.  There are a few
good reasons for this:
- Including it in gl.h is more strightforward and makes it easier to
troubleshoot include file problems.  It was sometimes hard to find it
in glext.h.
- Needed to define APIENTRY correctly.  APIENTRY is used in gl.h.
- glut.h needs windows.h but does not include it, expecting the app to
include it.  Including it in gl.h if not already included by the app
makes glut.h happy.  This allows one to write a gl/glut app without
explictly including windows.h, which may only be really important for
toy apps like our samples and demos.  But a "real" app can still
include windows.h if it wants.
2002-10-17 19:39:31 +00:00
Brian Paul
bc36ee25d8 new wrap modes (Ian Romanick) 2002-10-17 17:39:37 +00:00
Brian Paul
944ea204a8 s/functionOffset/offset/ 2002-10-17 16:29:17 +00:00
Brian Paul
10d343f407 patches from Gerk Huisma for float-channel rendering 2002-10-17 15:26:38 +00:00
Brian Paul
673077c613 applied Philippe Houdoin's patch, plus minor clean-ups 2002-10-17 14:25:30 +00:00
Brian Paul
8dfc5b9863 surround vertex program code with #if FEATURE_NV_vertex_program/#endif 2002-10-16 17:57:51 +00:00
Brian Paul
e32b909054 remove some crud 2002-10-16 17:57:03 +00:00
Brian Paul
2efb3029f0 remove lowpc.c and highpc.c 2002-10-15 15:55:45 +00:00
Brian Paul
10882b17c9 removed highpc.c and lowpc.c 2002-10-15 15:54:23 +00:00
Brian Paul
0977fa67b8 update file list for tar file 2002-10-15 15:40:57 +00:00
Brian Paul
f7657d037e make a few static function non-static for highpc.c 2002-10-15 15:36:26 +00:00
Brian Paul
d2ec14c4aa remove 'beta' from GL_VERSION string 2002-10-15 15:23:16 +00:00
Brian Paul
d4ffbe4cca allow querying of glut functions via glutGetProcAddress() 2002-10-15 15:23:02 +00:00
Brian Paul
dfedb8b78e added gluTessNormal() dummy function 2002-10-15 14:45:19 +00:00
Brian Paul
9d00b68482 added missing glFinish() 2002-10-15 14:44:53 +00:00
Brian Paul
7c5282d2a8 minor updates 2002-10-15 14:43:55 +00:00
Brian Paul
f2e21e1026 added latest 4.1 changes 2002-10-15 14:41:48 +00:00
Brian Paul
11fd2d7558 disable wsPriv field in __GLdrawablePrivateRec to match XFree86/DRI 2002-10-14 17:12:01 +00:00
Brian Paul
60b6e4fd7e context-related cleanups (ex: _mesa_notifySwapBuffers instead of _mesa_swapbuffers) 2002-10-14 17:08:17 +00:00
Brian Paul
795ae30787 Glide driver disabled by default 2002-10-14 14:19:11 +00:00
Brian Paul
45c569860c print transparent pixel info when using -v option (Gerd Sussner) 2002-10-14 13:57:23 +00:00
Brian Paul
cb4253a546 added missing GLX_TRANSPARENT_RGB 2002-10-14 13:52:27 +00:00
Brian Paul
2871f57bcf check EXT_point_parameters before calling PointParameterfvEXT() 2002-10-11 21:42:08 +00:00
Brian Paul
32d0d5aec4 init swrast->CurrentBuffer 2002-10-11 17:50:59 +00:00
Brian Paul
f58826db57 updated info about glRead/DrawBuffers() 2002-10-11 17:42:48 +00:00
Brian Paul
8ad1076dc2 Another round of glRead/DrawBuffer() clean-ups and simplifications.
Replaced ctx->Color._DriverDrawBuffer with swrast->CurrentBuffer.
Replaced ctx->Pixel._DriverReadBuffer with ctx->Pixel._ReadSrcMask.
swrast->Driver.SetBuffer() takes FRONT/BACK_LEFT/RIGHT_BIT values now.
Added tokens and code for GL_AUX buffers, for completeness.
2002-10-11 17:41:03 +00:00
Brian Paul
9e84910749 undo previous check-in (check if ctx->Color.DrawBuffer == mode) 2002-10-11 15:17:12 +00:00
Keith Whitwell
b110ca34f0 lineloop fix 2002-10-11 08:24:13 +00:00
Brian Paul
d54d4633fd check mode for no change in _mesa_Read/DrawBuffer() 2002-10-11 00:02:16 +00:00
Brian Paul
813c96f458 updated porting info 2002-10-10 23:49:02 +00:00
Keith Whitwell
fbc236b401 add GL_UNPACK_CLIENT_STORAGE_APPLE gets 2002-10-10 18:03:44 +00:00
Brian Paul
23cdcede5d check texImage->IsClientData before freeing memory 2002-10-10 14:12:09 +00:00
Brian Paul
71072be182 disable _glapi_set_warning_func() call as it's not present in older libGLs 2002-10-10 00:22:13 +00:00
Brian Paul
0670eb259d removed old TEXTURE0_ defines 2002-10-09 23:56:32 +00:00
Brian Paul
433a084130 removed old VERT_* defines, use VERT_BIT_* instead 2002-10-09 19:45:53 +00:00
Brian Paul
008a5dd7bb use new vertex bitfield tokens 2002-10-09 19:38:32 +00:00
Brian Paul
85678e0399 disable wscx field in __GLimportsRec to be consistant with XFree86 2002-10-09 19:37:32 +00:00
Brian Paul
c20579d651 XFree86 fixes (clib macro wrappers) 2002-10-09 19:36:24 +00:00
Brian Paul
f2c5296dd7 disable XMesaCreatePBuffer() for XFree86 2002-10-09 19:35:11 +00:00
Brian Paul
59c5cf35c9 finally get rid of ctx->Texture._ReallyEnabled field 2002-10-08 23:59:33 +00:00
Brian Paul
614301faca fix a typo 2002-10-08 23:58:55 +00:00
Brian Paul
ece3e63c98 change fog from GLfloat to GLfloat[4] (like other vertex attribs) 2002-10-08 23:57:50 +00:00
Brian Paul
5fd1cc2e0e s/glVertexAttrib4fNV/_glapi->Dispatch->VertexAttrib4fNV/ 2002-10-08 23:57:13 +00:00
Brian Paul
d3f6b0559f added missing dispatch code for new AGP-related functions 2002-10-08 23:16:26 +00:00
Brian Paul
b5974db277 import from DRI CVS 2002-10-08 23:14:43 +00:00
Brian Paul
8455203bc7 GLX_NV_vertex_array_range and GLX_MESA_agp_offset extensions 2002-10-08 22:47:53 +00:00
Jouk Jansen
f72a3da697 Committing in .
Add compile support in the xdemos directory for OpenVMS

 Modified Files:
 	Mesa/descrip.mms Mesa/xdemos/descrip.mms
 	Mesa/xdemos/glxgears.c
 ----------------------------------------------------------------------
2002-10-08 08:38:26 +00:00
Brian Paul
cf69eeb1aa removed old comment 2002-10-07 15:03:14 +00:00
Brian Paul
73029c5d75 added GLX_SGIX_fbconfig and GLX_SGIX_pbuffer 2002-10-05 18:32:38 +00:00
Brian Paul
5687740762 added pbinfo and pbdemo programs 2002-10-05 18:30:46 +00:00
Brian Paul
21666e3db4 pbuffer info and demo programs 2002-10-05 18:30:13 +00:00
Brian Paul
e4656003ca Pbuffers seem to work! 2002-10-05 18:27:41 +00:00
Brian Paul
fa647e8336 added XMesaCreatePBuffer() 2002-10-05 03:03:37 +00:00
Brian Paul
3265fe5f8e more work on fbconfig/pbuffer support 2002-10-05 03:02:34 +00:00
Brian Paul
f42d366bb6 GLfloat/GLchan updates 2002-10-05 03:02:01 +00:00
Brian Paul
4b334b2db6 restore ACCUM_BITS to 16 2002-10-05 03:01:28 +00:00
Karl Schultz
6640bc3bfa include procs for compressed textures 2002-10-04 23:11:03 +00:00
Karl Schultz
248b3cf727 remove const storage class specifier for the decl of a var that isn't
a const.
2002-10-04 23:10:06 +00:00
Brian Paul
072edaf126 updated list of internal changes in 4.1 2002-10-04 19:10:27 +00:00
Brian Paul
fc80ad6e62 Changed a number of context fields from GLchan to GLfloat (such as ClearColor).
Also changed parameter types for some driver functions (like ctx->Driver.Clear-
Color).  Updated all the device drivers.
Someday, we want to support 8, 16 and 32-bit channels dynamically at runtime.
2002-10-04 19:10:06 +00:00
Brian Paul
f782b8189e multiple GL_POINTS can now be rendered together into one fragment span 2002-10-04 17:37:45 +00:00
Karl Schultz
f8acbed50d Fix for bug 618459. Mods to allow compilation on VC++ 5.0 (Michael Krause) 2002-10-04 15:58:33 +00:00
Brian Paul
a42e7c9172 record GL_INVALID_VALUE in glVertexAttrib*NV() if index > 15 2002-10-03 23:27:22 +00:00
Brian Paul
be99e845bd finished up GL_EXT_stencil_two_side 2002-10-02 23:24:04 +00:00
Brian Paul
0adce5d0ed removed unused ctx->Polygon.OffsetMRD 2002-10-02 22:05:55 +00:00
Brian Paul
641b2307ec removed ctx->Polygon._OffsetAny - not really needed 2002-10-02 21:44:08 +00:00
Brian Paul
8420ad94f2 bring over from 4.0.4 branch 2002-10-02 17:32:26 +00:00
Brian Paul
d8419c730e better error checking related to YCbCr images 2002-10-02 17:25:05 +00:00
Brian Paul
54f3aab0c7 _glapi_get_proc_address() now always returns a valid dispatch stub function
(provided we're on x86 or SPARC).  Later, _glapi_add_entrypoint() will fix-up
the dispatch offset (which was -1).  This will allow DRI libGL to avoid
probing for drivers.
2002-10-02 01:51:44 +00:00
Jouk Jansen
a329d68903 Committing in .
texcompress.c added to OpenVMS makefile.

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2002-09-27 14:47:24 +00:00
Brian Paul
89fb06fcc1 new texture compression infrastructure 2002-09-27 02:45:37 +00:00
Brian Paul
1a0bfdc8c1 fix bug in index_mask() (bug 609837) 2002-09-23 17:21:53 +00:00
Brian Paul
681b8c9d1b merge gl_texture_image RowStride from DRI 4.0.4 2002-09-23 16:37:13 +00:00
Brian Paul
b7808884bb update from Daniel Borca 2002-09-21 22:45:37 +00:00
Brian Paul
551b65f137 GL_MESA_pack_invert 2002-09-21 17:34:56 +00:00
Brian Paul
c5b9950660 updates from 4.0.4 (MESA_ycbcr_texture, APPLE_client_storage, etc) 2002-09-21 16:51:25 +00:00
Brian Paul
c62aeed003 merge updates from 4.0.4 2002-09-21 16:47:09 +00:00
Brian Paul
f022463aa6 added src/BeOS/*.h to file list 2002-09-19 16:36:52 +00:00
Brian Paul
5b18bb6a60 stencil two-side and 3dfx fix 2002-09-19 16:34:55 +00:00
Brian Paul
ca6647b307 two-side stencil info 2002-09-19 16:34:29 +00:00
Brian Paul
473e51f2fb Updated BeOS support (Philippe Houdoin) 2002-09-19 16:19:43 +00:00
Brian Paul
cbc1fb0a9a push and pop ESI (Daniel Borca) 2002-09-19 16:07:32 +00:00
Brian Paul
b6e04ee7c8 obsolete 2002-09-19 16:05:01 +00:00
Brian Paul
a9be374f82 pull-in changes from DRI/Mesa-4.0.4 2002-09-17 15:46:34 +00:00
Brian Paul
e1cb2fb571 remove GLint t, pass target to _mesa_init_teximage_fields() 2002-09-17 14:14:18 +00:00
Brian Paul
d5bbbd41c4 fixed _mesa_generate_mipmaps() target problem 2002-09-16 17:57:14 +00:00
Brian Paul
8cd2d0e782 more detailed _mesa_error() messages 2002-09-16 17:56:02 +00:00
Brian Paul
c84e84a734 doxygen comments 2002-09-16 17:55:36 +00:00
Brian Paul
57aca2bf6e fixed pixel pack bug in glGetTexImage() 2002-09-14 16:51:34 +00:00
Karl Schultz
99683bd830 Mark destroyed context as not current. (Frank Warmerdam) 2002-09-12 17:05:55 +00:00
Brian Paul
4991d0f9f3 optimizations to _math_matrix_rotate() (Rudolf Opalla) 2002-09-12 16:26:04 +00:00
Brian Paul
3ce6dc7f1d more detailed _mesa_error() strings 2002-09-08 17:29:16 +00:00
Brian Paul
6c25e3a111 incorrect dimenstion passed to texture_error_check() in compressed teximage functions 2002-09-06 14:42:04 +00:00
Brian Paul
3f25b1a358 removed GL_MAX_CONVOLUTION_WIDTH/HEIGHT 2002-09-06 13:00:50 +00:00
Brian Paul
57df24a86c don't query GL_MAX_CONVOLUTION_WIDTH/HEIGHT 2002-09-06 12:58:56 +00:00
Brian Paul
28bc6cb479 minor updates to sync with XFree86 2002-09-06 03:47:34 +00:00
Brian Paul
2f7ef5fae8 added -l option to print interesting OpenGL limits 2002-09-06 03:35:43 +00:00
Brian Paul
e41c57758d fixed glSampleCoverage typo 2002-09-06 03:30:20 +00:00
Brian Paul
7d7ec0ea91 implemented glProgramParameters4[df]vNV() 2002-09-06 03:25:03 +00:00
Brian Paul
6a1e1623fd hook-up dispatch for glActiveStencilFaceEXT() 2002-09-06 03:20:21 +00:00
Brian Paul
fdaa72bc43 added GL_EXT_stencil_two_side and GL_NV_fence 2002-09-06 03:19:32 +00:00
Brian Paul
5f60a0b50a GL_EXT_stencil_two_side extension, not 100% complete yet. 2002-09-06 02:56:08 +00:00
Brian Paul
a2ae6faf1a removed glext.h fix-ups corrected in glext.h version 17 2002-09-06 02:52:23 +00:00
Brian Paul
e14c151f0a version 17 2002-09-06 02:48:09 +00:00
Brian Paul
530d4611eb added OpenGL 1.4 entrypoints 2002-09-06 02:46:08 +00:00
Brian Paul
3a03211aee added GL_IBM_texture_mirrored_repeat (Ian Romanick) 2002-09-05 21:16:30 +00:00
Brian Paul
e7abc078ab test for ARB_texture_cube_map when getting GL version(Ian Romanick) 2002-09-05 21:14:36 +00:00
Jouk Jansen
0a7fc572a7 Committing in .
Adding vsnprintf support for OpenVMS (needed in src/imports.c)

 Modified Files:
 	Mesa/src/Makefile.am Mesa/src/descrip.mms
 Added Files:
 	Mesa/src/vsnprintf.c
 ----------------------------------------------------------------------
2002-09-05 08:38:01 +00:00
Brian Paul
7e35cc53ce updated wglGetProcAddress 2002-09-04 14:14:36 +00:00
Brian Paul
528afb5ff4 updated DOS file list 2002-09-03 18:14:08 +00:00
Brian Paul
05ed911aca updates from Daniel Borca 2002-09-03 18:11:32 +00:00
Brian Paul
b9f75444e6 improved error string 2002-09-03 18:05:17 +00:00
Brian Paul
ba88dd0d92 s/5/NUM_TEXTURE_TARGETS/ 2002-09-03 18:03:45 +00:00
Brian Paul
ed00b2ef33 fixed compilation problem for swdd->SetBuffer 2002-09-03 17:10:54 +00:00
Brian Paul
391876e5e6 fix up stuff accidentaly checked in a few days ago 2002-08-29 14:02:27 +00:00
Karl Schultz
53880a85b6 Don't call _mesa_initialize_context because we are using
_mesa_create_context.  This avoids calling initialize twice and fixes
memory leaks.  Add call to free the GL context because we are creating it
with _mesa_create_context, fixing another leak.
2002-08-28 18:26:38 +00:00
Brian Paul
41771982c4 define GLAPIENTRY and GLAPI if not defined in gl.h 2002-08-27 21:47:31 +00:00
Brian Paul
fb657ef91d added glXAllocate/FreeMemoryNV() 2002-08-22 21:10:37 +00:00
Brian Paul
8fefafa220 stub functions for glXAllocate/FreeMemoryNV() 2002-08-22 21:10:01 +00:00
Brian Paul
2188d002df minor error message changes 2002-08-21 16:39:39 +00:00
Brian Paul
62166908a9 re-enable ASSIGN_NORM_GROUP( 3dnow ) 2002-08-21 13:07:17 +00:00
Brian Paul
1e0241d3c6 replace Current.Color with Current.Attrib[VERT_ATTRIB_COLOR0] 2002-08-21 13:05:37 +00:00
Keith Whitwell
713800a495 update colormaterial state on swtcl wakeup 2002-08-21 10:39:59 +00:00
Brian Paul
2b930072b3 s/DrawDestMask/_DrawDestMask/ 2002-08-21 02:59:31 +00:00
Brian Paul
b79e99ad60 s/ProjectedClipPtr/NdcPtr/ 2002-08-21 02:59:00 +00:00
Brian Paul
3ac01f5e47 fix problems in FXgetImage() 2002-08-21 02:57:58 +00:00
Brian Paul
34713c1a3c fixed array index typo in VERT_SAVE_RGBA() macro 2002-08-21 02:56:58 +00:00
Brian Paul
5117a8214d added multitexture and line stipple 2002-08-17 00:30:36 +00:00
Brian Paul
f569dc447a minor tweaks 2002-08-17 00:29:55 +00:00
Brian Paul
9f7011b88b added error checking for glCallLists() type parameter 2002-08-17 00:26:29 +00:00
Brian Paul
af3265fabd added new GLUT features 2002-08-17 00:23:19 +00:00
Brian Paul
6bf6cd3418 bump lib version to 3.7.1, more make clean commands 2002-08-17 00:20:48 +00:00
Brian Paul
7ae671446a added glutGetProcAddress() 2002-08-17 00:12:48 +00:00
Brian Paul
46a035f76d added glutGetProcAddress() and GLUT_FPS env var option 2002-08-17 00:12:12 +00:00
Karl Schultz
10730663a1 Add note about needing to run VCVARS32.BAT when compiling.
Add book and samples to the list of dirs that are built.
Reword some notes about the build process.
2002-08-15 15:13:31 +00:00
Brian Paul
1972ac661c added (char *) casts 2002-08-08 17:12:38 +00:00
Brian Paul
3efe5beefc fix up resulting FOGC and PSIZ when needed 2002-08-08 16:55:56 +00:00
Brian Paul
352c13f783 init tmp->Normal.size = 3 2002-08-08 16:55:17 +00:00
Brian Paul
ebe671cfad comments 2002-08-08 16:54:43 +00:00
Brian Paul
ea53a5b5ab change GLvector3f to GLvector4f for normal transformation 2002-08-08 16:53:12 +00:00
Brian Paul
946ad2720a change dest stride to 16 bytes instead of 12 2002-08-08 15:36:50 +00:00
Brian Paul
2a1abe3b46 initialize SWvertex array to zeros 2002-08-08 00:41:11 +00:00
Brian Paul
fb8ca95dff changed normal stride from 12 to 16 bytes since normals are now GLfloat[4] (for vertex program) 2002-08-07 16:40:18 +00:00
Brian Paul
a4ac844979 re-check-in - something didn't work on the previous check-in 2002-08-07 15:18:42 +00:00
Brian Paul
e968686133 latest bug fixes 2002-08-07 00:46:17 +00:00
Brian Paul
77df88727c struct sw_span is again allocated on the stack, but the arrays of span
data are broken out into a new struct span_arrays which is allocated
per-context (to avoid huge stack allocations - a problem on Windows).
This lets us use span.redStep instead of span->redStep (for example) to
hopefully get slightly better performance in the triangle functions.
2002-08-07 00:45:07 +00:00
Karl Schultz
2353e96c32 Coerce vsnprintf to _vsnprintf for windows 2002-08-03 16:19:20 +00:00
Brian Paul
971df9b389 misc updates 2002-08-01 15:16:46 +00:00
Brian Paul
c2656d588b define MAXSTRING and use vsnprintf to preven overflows 2002-08-01 15:10:23 +00:00
Karl Schultz
f1dee4fe8f Catch up windows driver with recent context mods 2002-07-29 00:01:00 +00:00
Karl Schultz
54572c1b93 export new symbols for osmesa lib 2002-07-28 18:01:36 +00:00
Brian Paul
c712425d0d fix warnings (bug 580528) 2002-07-22 13:45:31 +00:00
Brian Paul
5c711e3671 fix patching offsets (Sven Panne) (patch 544637) 2002-07-12 16:00:57 +00:00
Brian Paul
e237491493 silence warnings 2002-07-12 15:54:19 +00:00
Brian Paul
f02a5f6cc5 Pedantic compiler fixes (Sven Panne) 2002-07-12 15:54:01 +00:00
Brian Paul
902d2faadf applied Eric Anholt's patch for Athlon SSE 2002-07-11 15:33:02 +00:00
Brian Paul
8eaffa2a1c re-enable X86 code 2002-07-10 01:25:50 +00:00
Brian Paul
55c82c596e added Read/DrawBuffer porting info 2002-07-09 01:28:03 +00:00
Brian Paul
3b4fbbc129 Overhaul of glRead/DrawBuffer() code. Now, swrast->Driver.SetBuffer()
indicates the read AND draw color buffer for all software rasterization.
Lots of related clean-ups.  See RELNOTES-4.1 for details.
2002-07-09 01:22:50 +00:00
Jouk Jansen
b4338e5887 Committing in .
Adding a missing ',' in a parameter list of a routine called

 Modified Files:
 	Mesa/src/imports.c
 ----------------------------------------------------------------------
2002-07-01 08:26:00 +00:00
Brian Paul
89f9cf8add Added divide by zero check (Jon Perry). Remove dead vars. Fix indentation. 2002-06-30 16:58:11 +00:00
Brian Paul
c2fa38d5ae added Gerk Huisma's GLchan=GLfloat fixes 2002-06-30 16:16:03 +00:00
Brian Paul
4336c28c84 CHAN_TYPE==GL_FLOAT clamping. call _tnl_MakeCurrent. (Gerk Huisma) 2002-06-30 16:07:18 +00:00
Brian Paul
e201bef913 blending fixes for CHAN_TYPE==GL_FLOAT (Gerk Huisma) 2002-06-30 15:57:45 +00:00
Brian Paul
3c342ebd78 added GL_EXT_multi_draw_arrays 2002-06-30 15:49:03 +00:00
Brian Paul
e8ed14d0c2 added unofficial dispatch offsets for GL_EXT_multi_draw_arrays functions 2002-06-30 15:47:43 +00:00
Brian Paul
2525bc7d30 Implemented GL_EXT_multi_draw_arrays: glMultiDrawArraysEXT() and glMultiDrawElementsEXT(). 2002-06-30 15:47:00 +00:00
Brian Paul
1074d8c361 indentation fix 2002-06-29 20:04:57 +00:00
Brian Paul
487047c060 prep for OpenGL 1.4 feature set 2002-06-29 20:03:13 +00:00
Brian Paul
4e9676fb13 Applied Matt Sealey's patch to remove/isolate all stdio.h function calls.
Instead of mstdio.[ch], use imports.[ch] to isolate these functions.
2002-06-29 19:48:15 +00:00
Brian Paul
f1ad551604 fix CHAN_TYPE==GL_FLOAT compile problem 2002-06-26 14:56:20 +00:00
Brian Paul
058f319f60 pull in 4.0.3 docs to trunk 2002-06-26 02:36:34 +00:00
Brian Paul
7082420653 removed extra right-paren 2002-06-25 15:25:17 +00:00
Keith Whitwell
07bb9884a5 FRONT_AND_BACK culling 2002-06-25 08:44:27 +00:00
Brian Paul
82d9f3c034 finish-up vertex program evaluators 2002-06-25 02:56:45 +00:00
Brian Paul
0c3f820bf0 remove an unneeded statement in update_polygon(), added a comment 2002-06-25 02:31:37 +00:00
Brian Paul
4db3c48a13 test program for NV_vertex_program and evaluators 2002-06-23 02:57:33 +00:00
Brian Paul
581cc2025f fix problems in _mesa_debug/printf() 2002-06-23 02:53:22 +00:00
Brian Paul
8e7bd03760 added some _mesa_debug() calls 2002-06-23 02:52:18 +00:00
Brian Paul
2abbb660a2 checkpoint: updates for NV_vertex_program evaluators - a bit more left to do 2002-06-23 02:47:38 +00:00
Brian Paul
d65e0beb68 set stage->inputs properly (I think), plus debug/comment updates 2002-06-23 02:40:48 +00:00
Brian Paul
455d262c55 added support for NV_vertex_program evaluators 2002-06-23 02:36:27 +00:00
Brian Paul
837bf6e2df Added new bitfields to tnl_eval_store for NV_vertex_program evaluators 2002-06-23 02:32:39 +00:00
Brian Paul
775669f6ef put XSync in get_buffer_size(), plus clean-up 2002-06-19 21:49:37 +00:00
Brian Paul
02c03ef6b4 Moved GL_PROGRAM_ERROR_POSITION_NV state (it's not per-program).
Finished all glGet* queries for GL_NV_vertex_program.
Improved error reporting in glEnable/Disable/Get, etc.
2002-06-18 16:53:46 +00:00
Jouk Jansen
f922986238 Committing in .
Added mtypes.h inclusion

 Modified Files:
 	Mesa/src/imports.c
 ----------------------------------------------------------------------
2002-06-18 08:35:25 +00:00
Brian Paul
10d7f540ff new fix for initial window size problem 2002-06-17 23:38:14 +00:00
Brian Paul
85d816028a Port glXCopyContext bug from 4.0 branch. 2002-06-17 23:36:31 +00:00
Brian Paul
d373819b8c Joe Krahn's context sharing test program 2002-06-16 03:57:48 +00:00
Brian Paul
83b820aa98 Fix glXCopyContext bug 2002-06-16 03:56:11 +00:00
Brian Paul
1043a6498a fix a comment 2002-06-16 01:14:22 +00:00
Brian Paul
d834e8da88 fixed window size initialization bug 2002-06-16 01:11:10 +00:00
Brian Paul
8816c70a61 added a comment 2002-06-16 01:10:41 +00:00
Brian Paul
d66ca10c53 added some braces 2002-06-16 01:09:16 +00:00
Brian Paul
e514cfea74 the GGI driver is up to date 2002-06-15 03:15:16 +00:00
Brian Paul
4e99da15eb test for GL_NV_texture_rectangle 2002-06-15 03:08:19 +00:00
Brian Paul
9c0babf24f added GL_ARB_texture_env_crossbar 2002-06-15 03:06:16 +00:00
Brian Paul
e769cda1eb updates to 4.1 features 2002-06-15 03:05:36 +00:00
Brian Paul
bfa168e3fc updated with 4.0.x -> 4.1 porting info 2002-06-15 03:03:58 +00:00
Brian Paul
8afe7de8de Implemented GL_NV_texture_rectangle extension.
Replace struct gl_texure_object's Dimension w/ Target field.
Added _EnabledUnits to struct gl_texture_attrib - the _ReallyEnabled
  field is obsolete, but still present for now.  This effectively
  removes the 8-texture units limit, 32 units now possible, but unlikely!
New TEXTURE_1D/2D/3D/CUBE/RECT_BIT tokens for unit->_ReallyEnabled field.
Updated device drivers to use ctx->Texture._EnabledUnits.
2002-06-15 03:03:06 +00:00
Brian Paul
8bdd0dc8d0 #ifdef-out unused big-endian texel fetch functions 2002-06-15 02:55:22 +00:00
Brian Paul
9d47f3d6b8 added missing ctx parameter to _mesa_debug() calls 2002-06-15 02:54:01 +00:00
Brian Paul
4753d60dd0 Added ctx parameter to _mesa_debug()
Added _mesa_printf()
Updated SetDrawBuffer() function in all drivers (ala 4.0.3)
Import 4.0.3/DRI changes.
2002-06-15 02:38:15 +00:00
Jouk Jansen
5e54ddc3a6 Committing in .
Added <stdarg.h>

 Modified Files:
 	Mesa/src/imports.c
  ----------------------------------------------------------------------
2002-06-13 08:27:32 +00:00
Jouk Jansen
f8035450bb Committing in .
Removed config.c

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2002-06-13 07:22:59 +00:00
Brian Paul
4c4663747c added Porting Information section 2002-06-13 04:50:09 +00:00
Brian Paul
d09a1d8b29 more removal of fprintf() calls 2002-06-13 04:49:17 +00:00
Brian Paul
2f35d5e9d5 fixed a couple dumb mistakes 2002-06-13 04:31:09 +00:00
Brian Paul
9a33a11d71 New _mesa_debug() function to replace fprintf() calls.
Some source files updated to call _mesa_debug(), but not finished.
Added __GLimports as a parameter to _mesa_create/init_context() and
updated drivers accordingly.
Fleshed-out more of the __GLimports and __GLexports functionality.
Removed run-time config file support (config.c)
2002-06-13 04:28:29 +00:00
Brian Paul
1013e46504 Moved big/little endian code to glheader.h.
Define either MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN.
2002-06-12 00:52:50 +00:00
Brian Paul
35883ceb93 Fix NASM problems, remove static var in SSE detection code. (Josh Vanderhoof) 2002-06-11 01:26:58 +00:00
Brian Paul
4fe2f3f1a0 Added CPLUSPLUS for sunos5 entries 2002-06-10 17:01:46 +00:00
Brian Paul
b58c5ad7b0 GGI driver updates (Filip Spacek) 2002-06-10 15:16:44 +00:00
Brian Paul
dd41748f63 added missing texture cube map targets 2002-06-08 12:39:18 +00:00
Brian Paul
3f058cd2c5 version 15 of glext.h 2002-06-07 20:21:12 +00:00
Brian Paul
9800adaed2 s/GL_MAX_TEXTURE_RECTANGLE_SIZE_NV/GL_MAX_RECTANGLE_TEXTURE_SIZE_NV/ 2002-06-07 19:29:49 +00:00
Brian Paul
112f7cdeab fixed point sprite bug 2002-06-07 16:01:03 +00:00
Brian Paul
f21a4872e8 replaced hard-coded 4 with NUM_TEXTURE_TARGETS 2002-06-06 16:31:24 +00:00
Brian Paul
e0107e87a7 replaced 0xf and 0xf0 with TEXTURE0_ANY and TEXTURE1_ANY 2002-06-06 16:19:25 +00:00
Brian Paul
241afd837c NASM fix for *_CONTENT() macros (Josh Vanderhoof) 2002-06-06 15:33:37 +00:00
Brian Paul
af2a1c1d67 more big-endian tweaks 2002-06-05 16:48:54 +00:00
Brian Paul
28b03c6acb use CONTENT() macro on line 205 (Josh Vanderhoof) 2002-06-04 21:29:20 +00:00
Brian Paul
f5a0781975 bring over Michel Daenzer's DRI changes 2002-06-03 16:06:34 +00:00
Brian Paul
91d6f12b4a added another spot-check to verify dispatch table correctness 2002-05-29 15:23:16 +00:00
Brian Paul
60f1a3c288 Added GL_NV_point_sprite functions: glPointParameteri[v]NV().
Removed dead ARB_window_pos functions (we alias the MESA_window_pos funcs).
2002-05-29 15:16:01 +00:00
Brian Paul
1d155c1dd8 added GL_NV_point_sprite entrypoints 2002-05-29 15:14:13 +00:00
Brian Paul
4290dbac4d added -axK to linux-icc CFLAGS 2002-05-27 17:13:42 +00:00
Brian Paul
a078d75a27 some initial work for fbconfigs/pbuffers 2002-05-27 17:06:59 +00:00
Brian Paul
1c40d50014 added GL_NV_point_sprite 2002-05-27 17:05:51 +00:00
Brian Paul
f105bc4095 removed experiemental GL_MESA_sprite_point extension 2002-05-27 17:05:19 +00:00
Brian Paul
6c408b4667 replaced experimental MESA_sprite_point with NV_point_sprite 2002-05-27 17:04:52 +00:00
Brian Paul
23d8ef3937 dispatch offsets for ARB_window_pos 2002-05-27 17:03:08 +00:00
Brian Paul
22538b23b4 updated vertex program dispatch 2002-05-27 17:00:18 +00:00
Brian Paul
ee29d3b42a updated vertex program dispatch offsets to official values 2002-05-27 16:58:24 +00:00
Keith Whitwell
02e0de263e another checkpoint of struct immediate replacement code 2002-05-11 08:38:25 +00:00
Brian Paul
002483e009 Minor change to current raster position and texcoords. 2002-05-09 21:54:16 +00:00
Keith Whitwell
9228a9362c Fix FETCH(argb1555) mask values 2002-05-09 20:51:05 +00:00
Brian Paul
79cfdebbe0 remove -xK flag from linux-icc 2002-05-06 15:46:05 +00:00
Brian Paul
30ec9dbaed added linux-icc config (Marc.Dietrich) 2002-05-05 16:00:06 +00:00
Alan Hourihane
a5cdf99951 remove test code 2002-05-02 09:17:59 +00:00
Alan Hourihane
056b35874b glutSwapBuffers implicitly does a glFinish when swapping back to the front
buffer. We now issue a glFinish when not issuing SwapBuffers to ensure
the pipeline is complete.

(Problem found with Chromium).
2002-05-02 09:15:22 +00:00
Brian Paul
f595212336 Implemented GL_ARB_texture_env_crossbar.
Simplification of some of the texture application code.
2002-05-02 00:59:20 +00:00
Brian Paul
c450d57991 replaced GLshort with GLushort in _mesa_sizeof_packed_type() 2002-04-26 13:59:09 +00:00
Brian Paul
18385b0f4e added GL_TEXTURE_MAX_ANISOTROPY_EXT to glGetTexParameteriv() 2002-04-26 13:40:11 +00:00
Brian Paul
57c35b162e added GL_TEXTURE_MAX_ANISOTROPY_EXT to glGetTexParameter (bug 548812) 2002-04-25 22:11:33 +00:00
Brian Paul
df7bd4bf11 test mapsize against 1, not 0 in glPixelMap() 2002-04-24 20:11:20 +00:00
Brian Paul
fb68919362 added GL_EDGE_FLAG_ARRAY_COUNT_EXT to glGetBooleanv() (Bug 548277) 2002-04-24 20:05:26 +00:00
Karl Schultz
dc2270b461 Apply alpha buffer control fix to accum buffer too. 2002-04-23 18:39:09 +00:00
Karl Schultz
e694a8765a Fix up alpha buffer handling for Windows.
- add two new Pixel Format Descriptors that do not have alpha bits to
mirror the two that do.
- add logic to wglChoosePixelFormat to match PFD's with respect to alpha.
- Create/clear software alpha buffer as required.
Now a wgl or GLUT program can control the creation of a software alpha
buffer via the PFD or GLUT parms, respectively.
2002-04-23 18:23:32 +00:00
Brian Paul
62c36a2ff3 call _mesa_sizeof_packed_type() in _mesa_GetTexImage() (bug 547203) 2002-04-23 16:44:46 +00:00
Alan Hourihane
dec0131a29 Test for NULL pointer for LoadMatrix(), MultMatrix() and
Load/MultTransposeMatrix() and return without recording any errors or
doing any multiplication.
2002-04-22 20:00:16 +00:00
Brian Paul
fdd631a941 removed CVS $Log comments 2002-04-22 16:03:37 +00:00
Brian Paul
62954c8c30 test program for NV_vertex_program + vertex arrays 2002-04-22 15:53:54 +00:00
Jouk Jansen
bcc5d46b08 Committing in .
Remove __FUNCTION__ macro definition from CC compile definitions.
 (OpenVMS only)

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2002-04-22 10:29:43 +00:00
Brian Paul
f55b303fc2 added to-do list for the 4.1 release 2002-04-21 21:12:49 +00:00
Brian Paul
61bac6014a check for vertex program mode 2002-04-21 21:04:46 +00:00
Brian Paul
28c61d5b49 fixed assertion, replaced switch() with if/elseif 2002-04-21 21:03:02 +00:00
Brian Paul
12bab63f09 Vertex program attribute arrays seem to work now. This includes fallbacks
to the conventional arrays when attribute arrays aren't enabled.
2002-04-21 20:37:04 +00:00
Brian Paul
f3781eaafa added support for vertex program attribute arrays 2002-04-21 19:39:48 +00:00
Brian Paul
b7752724d9 vertex program attribute array work 2002-04-21 18:49:18 +00:00
Brian Paul
1113e3266f fixed Width/Height cut&paste typo 2002-04-20 17:54:55 +00:00
Jose Fonseca
04df3bbe8e Re-scheduling of the instructions according to the MMX pairing rules. This is dificult to quantify but the improvemnet reaches about of 0.7% in some cases in a Pentium III. In older Pentiums the improvements could be quite substancial due less capable integer pipelines. 2002-04-19 21:27:12 +00:00
Jose Fonseca
3fe2bb8933 Added min and max blend functions.
Slight optimization of _mesa_mmx_blend_add.
2002-04-19 20:12:30 +00:00
Karl Schultz
4fa66fa85c Provide a reasonable replacement for __FUNCTION__ when using non GNU C
compilers.  This allows Mesa to compile with non GNU C compilers again.
2002-04-19 15:49:40 +00:00
Brian Paul
bf80e1ed62 Allocate a sw_span struct in the swrast context instead of allocating it
on the stack frame in the point/line/triangle functions. (Klaus Niederkrueger)
This should solve the performance problem Karl found on Windows.
2002-04-19 14:05:50 +00:00
Brian Paul
05be7ae125 pass context pointer to _tnl_free_immediate(), removed backref pointer 2002-04-19 12:32:14 +00:00
Jose Fonseca
0c527ab054 MMX add blending function added. 2002-04-19 10:53:08 +00:00
Jose Fonseca
533e88824a MMX modulate belding function added.
Factorization of more common MMX code.
2002-04-19 10:33:34 +00:00
Alan Hourihane
68c48df2bf Correct check for noop array state change (Raystonn) 2002-04-19 08:38:23 +00:00
Brian Paul
26e2fb062a removed a stray debug printf 2002-04-19 01:08:48 +00:00
Brian Paul
4c5f8a8207 C++ fix 2002-04-19 00:47:07 +00:00
Brian Paul
7322cccfb9 new casts 2002-04-19 00:45:50 +00:00
Brian Paul
6c5b7029b3 added two (GLchan *) casts 2002-04-19 00:42:20 +00:00
Brian Paul
a670c1280b casts to fix GLint/GLuint mismatches 2002-04-19 00:38:27 +00:00
Brian Paul
db07de057f added some casts 2002-04-19 00:23:08 +00:00
Brian Paul
36c3df78f4 restored writeAll = GL_FALSE test/assignment 2002-04-18 14:57:00 +00:00
Jose Fonseca
55d9ee83b4 Definition of several utility macros for self-contained MMX operations such as scaling and lerping.
Restructured the MMX blending function to use a template, being only necessary to specify the main loop, which is also used for making the runin and runout sections.
Optimization of the MMX function after remembering that the multiplication was commutative (how can somebody forget this..) resulting in less register usage. Now there is no need for generate or read from memory any constant inside the loop.

Assemblers other than the GNU assembler can choke on the output of the C preprocessor since it was necessary to add line separators ';' to the defined macros.
2002-04-18 11:57:28 +00:00
Keith Whitwell
9ff3e9d992 Core of the future vertex engine. Isn't built yet, nor will be for a while...
Checkpoint commit.
2002-04-18 08:17:03 +00:00
Jose Fonseca
ef65c60d88 Removed code that was proven to have faster alternatives to reduce complexity and facilitate reusability. 2002-04-18 08:09:50 +00:00
Brian Paul
4c1f79264e fixed problem with swap() function and GCC3 (patch 414404) 2002-04-17 19:30:41 +00:00
Brian Paul
620735af45 Disabled SPARC cliptest functions for now. See bug report 544665. 2002-04-17 19:08:32 +00:00
Jose Fonseca
d60bb2fbc8 Remaining patch for the 255x255=255 identity correction be
made also in the runin and runout section of the code.
2002-04-14 11:33:54 +00:00
Brian Paul
cffb351a62 Jose's latest patch (GMBT_GEOMETRIC_CORRECTION) 2002-04-12 21:56:42 +00:00
Brian Paul
8c598cfd82 fixes for corrected GL_DOT3_RGB[A]_EXT token values 2002-04-12 21:17:28 +00:00
Brian Paul
cb445412fc version 13 of glext.h - fixes GL_EXT_texture_env_dot3 token values 2002-04-12 21:09:12 +00:00
Brian Paul
d23de4d334 updated a few comments 2002-04-12 15:47:21 +00:00
Brian Paul
b7f5e92f17 Klaus Niederkrueger's latest changes: use INIT_SPAN() to init span primitive
type, width, interp mask and array mask.
2002-04-12 15:39:58 +00:00
Brian Paul
9add9a21d8 new MMX blend code (Jose Fonseca) 2002-04-10 16:32:32 +00:00
Jouk Jansen
0cd8a1ea13 Committing in .
Update OpenVMS makefile

 Modified Files:
 	Mesa/src/descrip.mms
 ----------------------------------------------------------------------
2002-04-10 13:17:59 +00:00
Keith Whitwell
306d3fcdba bring in changes from dri tcl branch 2002-04-09 16:56:50 +00:00
Karl Schultz
e503d8b56f Update filelist to reflect two removed source files. 2002-04-09 15:33:49 +00:00
Keith Whitwell
0a79baf1bf remove dead vertex assembly 2002-04-09 14:58:03 +00:00
Keith Whitwell
851de7ded1 remove dead vertex assembly 2002-04-09 14:47:57 +00:00
Brian Paul
c030a18ea6 tranforming display list normals by non-uniform scale didn't work (Carlos Pereira) 2002-04-08 15:37:13 +00:00
Karl Schultz
17642eddf4 Added -perf option to measure frame rate. This is useful for measuring
Mesa in a more environment-independent way.
2002-04-05 17:40:20 +00:00
Brian Paul
ebe4e3237c repair Array.NewState flags (Michael Fitzpatrick) 2002-04-04 23:59:14 +00:00
Karl Schultz
14209028b6 export more symbols for osmesa (win32) 2002-04-04 18:27:49 +00:00
Karl Schultz
4d030ba651 casts to silence compiler warnings 2002-04-04 18:25:40 +00:00
Brian Paul
db0944b08a latest 4.1 features and bug fixes 2002-04-04 17:01:50 +00:00
Brian Paul
42f916de5c fixed some 3D texture image stride bugs when using 16-bit channels 2002-04-04 16:59:05 +00:00
Brian Paul
01dc182ee8 added OSMesaGetProcAddress() 2002-04-04 16:58:04 +00:00
Brian Paul
486734a5d5 Texture combine alpha subtraction was wrong. Fixed 16-bit channel glitches 2002-04-04 16:56:24 +00:00
Brian Paul
09784e1e15 use NULL lambda array for pixel texture 2002-04-04 16:53:59 +00:00
Brian Paul
d5c94ef40d fixed 16 bit/channel problem in blend_modulate() 2002-04-04 16:53:26 +00:00
Brian Paul
543381510d fixed 16/32-bit channel problems in CopyColor[Sub]Table() 2002-04-04 16:53:00 +00:00
Brian Paul
1d84421b7e fixup float/ushort conversion macros 2002-04-04 16:51:52 +00:00
Brian Paul
6b50a004ff blend_add() modified for GLfloat channels 2002-04-04 01:40:18 +00:00
Brian Paul
02ee456248 call _mesa_ResizeBuffersMESA() in OSMesaMakeCurrent() to reconcile buffer size changes 2002-04-04 00:54:02 +00:00
Brian Paul
db30cc8d00 added an error check 2002-04-02 23:53:56 +00:00
Brian Paul
99aab34199 return NULL from Fake_glXCreateContext() if dpy or visinfo are NULL 2002-04-02 23:52:53 +00:00
Brian Paul
b63e8556fa more blending updates from Jose 2002-04-02 23:36:50 +00:00
Brian Paul
31fe0ade35 minor re-org 2002-04-02 16:20:00 +00:00
Brian Paul
9de4782e49 added GL_ARB_point_parameters 2002-04-02 16:19:21 +00:00
Brian Paul
f9e75c31e8 DJGPP updates 2002-04-02 16:18:20 +00:00
Brian Paul
17b7cc4cae faster blending (Jose Fonseca) 2002-04-02 16:16:45 +00:00
Brian Paul
01bcd83def updates from Jose Fonseca 2002-04-02 16:16:14 +00:00
Brian Paul
1537b63fce GL_ARB_point_parameters support 2002-04-02 16:15:16 +00:00
Brian Paul
86a7cc6f2c minor optimization in GL_TRANSFORM_BIT popping 2002-04-01 17:03:38 +00:00
Brian Paul
6c921af034 DOS driver update 2002-04-01 17:01:33 +00:00
Karl Schultz
a97d216adb Add _glapi_get_context to export for osmesa. 2002-03-29 23:49:51 +00:00
Brian Paul
103bc0f75c Replaced ClipEnabled[] array and _AnyClip with ClipPlanesEnabled bitmask. 2002-03-29 17:27:59 +00:00
Brian Paul
23d319fc7d use _glapi_get_context() instead of GET_CURRENT_CONTEXT(ctx); in buffer_size() 2002-03-29 17:20:48 +00:00
Brian Paul
a68b8dfd76 Use invert_matrix_general() instead of invert_matrix_perspective() because
the later fails for some projection matrices (ala Vis5D with Chromium).
2002-03-29 17:18:08 +00:00
Brian Paul
f66de79365 decrement Transform._AnyClip when clip planes are disabled 2002-03-28 22:45:45 +00:00
Brian Paul
934bee04f2 popping of user-defined clip planes was broken 2002-03-28 22:42:41 +00:00
Brian Paul
7c8b5399f0 reset span.end to zero after rendering the span 2002-03-28 16:24:14 +00:00
Brian Paul
c028617784 fixed inequality in an assertion 2002-03-27 15:49:27 +00:00
Brian Paul
e6f2b4174b removed a bad assertion 2002-03-25 17:24:43 +00:00
Brian Paul
2161b8cf03 more extensions 2002-03-23 16:35:40 +00:00
Brian Paul
3c70f6f2ac exercise GL_EXT_shadow_funcs 2002-03-23 16:34:18 +00:00
Brian Paul
636b2801d9 Test implementation of proposed GL_EXT_shadow_funcs extension. This just
generalizes the R/texture comparision operators to include all eight of
the depth test comparisons.
2002-03-23 16:33:53 +00:00
Brian Paul
25b85bf02a bring over from the 4.0 branch 2002-03-23 02:38:39 +00:00
Brian Paul
4544bd22fd added 4.0.2 info 2002-03-23 02:38:10 +00:00
Brian Paul
252250ae64 re-adding a lost file 2002-03-23 02:37:17 +00:00
Brian Paul
e69bfe74d7 DOS/Mesa driver updates (Daniel Borca) 2002-03-23 02:34:07 +00:00
Brian Paul
6211144e05 use -O3 to compile osmesa16/32 targets 2002-03-23 02:30:18 +00:00
Brian Paul
7de02fef5b replaced an assertion with a conditional 2002-03-23 02:29:37 +00:00
Brian Paul
819505ad2a removed temporary GL_ARB_texture_mirrored_repeat enums 2002-03-23 01:49:58 +00:00
Brian Paul
8334c89e70 removed temporary ARB_texture enum defs 2002-03-23 01:48:18 +00:00
Brian Paul
e3af5354a6 latest extension headers from SGI 2002-03-23 01:47:27 +00:00
Brian Paul
491e573c38 removed glSamplePass() 2002-03-20 22:07:17 +00:00
Brian Paul
80ac8d171c don't set plane mask for xm_buffer->gc, it causes an accum buffer conformance problem 2002-03-19 16:48:06 +00:00
Brian Paul
aeb4434563 Use MESA_PBUFFER_ALLOC/FREE macros to allocate all framebuffer and texture
memory.  These can be overridden by applications which need to manage this
memory specially.  Contributed by Gerk Huisma.
Also, new code for 8-bit -> 16-bit/channel texture image storage which
fills in the least-significant bits properly.
2002-03-19 16:47:04 +00:00
Brian Paul
d0570646bd fix Intel C compiler warnings (Gerk Huisma) 2002-03-19 15:22:50 +00:00
Brian Paul
f7c830e35c rename ResizeBuffersMESA to ResizeBuffers 2002-03-16 18:07:39 +00:00
Brian Paul
ac5bbe4c4a added latest 4.1 bug fixes/updates 2002-03-16 18:03:40 +00:00
Brian Paul
31f12f504e New mipmap lambda calculation. Previously, trilinear filtering could
result in _very_ blurry textures.  Still need to do some optimization
of the new code in s_span.c
2002-03-16 18:02:07 +00:00
Brian Paul
bc6b60c4ff buffer resize changes 2002-03-16 00:57:14 +00:00
Brian Paul
93c132a058 added XMesaResizeBuffers() 2002-03-16 00:53:48 +00:00
Brian Paul
18a285a5e2 Lots of changes related to framebuffer/window buffer resizing. Basically,
instead of passing a GLcontext* to ResizeBuffers(), pass a GLframebuffer*.
The idea is that a window can be resized without it being bound to a rendering
context.  This makes for a nice clean-up in the XFree86 server-side GLX code.
Renamed ctx->Driver.ResizeBuffersMESA() to ctx->Driver.ResizeBuffers().
2002-03-16 00:53:15 +00:00
Brian Paul
8d687e7e58 protect currentReadable reference with #ifndef GLX_BUILT_IN_XMESA 2002-03-15 18:43:25 +00:00
Brian Paul
1d822ea8cf updated comments. removed dead code. 2002-03-15 18:33:12 +00:00
Brian Paul
a72edf01ba remove a debug printf 2002-03-15 18:24:53 +00:00
Brian Paul
8843d52af1 fixed typo in CONVERT_TEXEL_DWORD for convert_abgr8888_to_ai88 textures (Michael Fitzpatrick) 2002-03-15 18:05:49 +00:00
Brian Paul
612fc01293 fixed pointer arithmetic error in glCopyPixels 2002-03-14 22:09:25 +00:00
Brian Paul
d488af5b34 added _mesa_image_image_stride() 2002-03-13 04:34:32 +00:00
Brian Paul
9a888bdc2a added a comment 2002-03-13 04:33:32 +00:00
Brian Paul
f9708e45ac initial work for NV_vertex_program1_1 extension 2002-03-13 04:33:16 +00:00
Brian Paul
1d01794e6e Removed the xm_context field from XMesaBuffer. It was preventing N threads
from rendering into one window in parallel and wasn't really needed anyway.
2002-03-12 21:55:50 +00:00
Brian Paul
5033f21d05 tweak file list for tarballs 2002-03-11 14:59:50 +00:00
Brian Paul
1c91fe2e3f obsolete 2002-03-11 14:57:40 +00:00
Brian Paul
a3e44f4531 fix some minor warnings 2002-03-08 19:44:28 +00:00
Brian Paul
b43a828ad4 DOS driver updates from Daniel Borca 2002-03-08 19:27:17 +00:00
Brian Paul
7fd50afbbf new DOS driver files from Daniel Borca 2002-03-08 19:24:56 +00:00
Brian Paul
2b9ba3f84f new assertions, use INLINE macro (Klaus Niederkrueger) 2002-03-08 00:09:18 +00:00
Brian Paul
5104b4d9df minor patches from David Dawes 2002-03-07 21:50:41 +00:00
Brian Paul
0b2fa873c6 syntax fixes for Solaris (David Dawes) 2002-03-07 21:40:08 +00:00
Brian Paul
c5a76cbed4 silence gcc warnings (Marc La France) 2002-03-01 04:28:32 +00:00
Brian Paul
09a0cb464d updated comments for CHAN_BITS=16 or 32 2002-03-01 04:23:36 +00:00
Brian Paul
aa24e9171a use official enum values for GL_ARB_depth_texture and GL_ARB_shadow 2002-02-25 22:18:14 +00:00
Brian Paul
e0193a9425 DOS updates from Daniel Borca 2002-02-23 17:11:27 +00:00
Brian Paul
c7a3356746 Fixed out-of-bounds memory write problem (CONVERT_TEXEL_DWORD macro).
Renamed 'packing' to 'unpacking' since we're moving data from client -> GL.
Rnamed DST_ROW_WIDTH to DST_ROW_BYTES.
2002-02-21 15:12:31 +00:00
Brian Paul
d0271502f8 check for initialized XMesaBuffer in XMesaGarbageCollect() 2002-02-20 23:59:03 +00:00
Brian Paul
ad7306b23c Updated 1D/3D/cube mipmapping code to work like the new 2D code. 2002-02-17 17:58:31 +00:00
Brian Paul
9ff74a0f15 undo some debug changes mistakenly checked in earlier 2002-02-17 17:37:55 +00:00
Brian Paul
711e27fda2 Simplified fog code. 2002-02-17 17:30:57 +00:00
Brian Paul
983bc3e018 don't include s_fog.h 2002-02-17 17:30:23 +00:00
Brian Paul
4f252bd980 Lots of improvements in the 2D texture sampling code. Fewer function calls
and no more switches inside loops.  To do: give the 1D/3D/cube routines the
same treatment.
2002-02-17 01:58:59 +00:00
Brian Paul
c14a5a6c62 Optimized the interpolate_texcoords() function:
Use fast approximation to log().
  Check for dq==0 to avoid a per-pixel divide.
2002-02-17 01:49:31 +00:00
Brian Paul
8baae48fb7 removed dead code 2002-02-16 23:44:46 +00:00
Brian Paul
f204c9d2bb updated to use GL_ARB_depth_texture, GL_ARB_shadow, GL_ARB_shadow_ambient 2002-02-16 14:54:18 +00:00
Brian Paul
9ac7182ec4 use separate GC for SwapBuffers to avoid colormask problem 2002-02-15 19:15:33 +00:00
Brian Paul
026c036be0 include string.h to silence warning 2002-02-15 16:48:48 +00:00
Brian Paul
78a21f96b5 added new depth_texture/shadow tokens (temporary) 2002-02-15 16:41:36 +00:00
Brian Paul
2e47ff7b9c Finished up GL_ARB_depth_texture and GL_ARB_shadow 2002-02-15 16:37:36 +00:00
Brian Paul
9a3061715c updated VERT_BIT_* definitions 2002-02-15 16:32:36 +00:00
Brian Paul
4182cf60d9 Finished up GL_ARB_depth_texture and GL_ARB_shadow. 2002-02-15 16:32:06 +00:00
Brian Paul
c9ceef41fe GL_ARB_window_pos fog fix 2002-02-15 16:27:13 +00:00
Brian Paul
a8f2efd147 finished up GL_ARB_window_pos 2002-02-15 16:26:08 +00:00
Brian Paul
70b8d304bb added a glClear() error check 2002-02-15 16:25:16 +00:00
Brian Paul
4ba35633d6 fixed a multitexture MatrixMode() bug 2002-02-15 16:24:37 +00:00
Brian Paul
c4c4213b69 obsolete 2002-02-15 14:10:19 +00:00
Brian Paul
ce57201825 uniformly pass texcoords as GLfloat [4] 2002-02-15 03:41:47 +00:00
Brian Paul
09700ee358 added alternate glBitmap code (disabled) 2002-02-15 03:41:00 +00:00
Brian Paul
a048da0767 added SPAN_SPEC flag in smooth_multitextured_line() 2002-02-15 03:39:37 +00:00
Brian Paul
3ff07d2062 fixed float->int conversion. Fix conditional for 16-bit Z buffer path 2002-02-15 03:38:12 +00:00
Brian Paul
ca7596e834 updated GL_VENDOR string 2002-02-14 00:40:24 +00:00
Brian Paul
95e2c72fd5 minor clean-up 2002-02-14 00:39:53 +00:00
Keith Whitwell
d4e02d6026 Remove debug 2002-02-13 23:53:19 +00:00
Brian Paul
cbd9a0254e now supports > 2 texture units 2002-02-13 02:23:33 +00:00
Keith Whitwell
0cb28418d0 More suport for t&l drivers
Fix GLuint compare bugs
Fix RESET_STIPPLE calls
2002-02-13 00:53:19 +00:00
Karl Schultz
12a1024d9d fix compiler warning (windows) 2002-02-12 16:45:22 +00:00
Brian Paul
38d042a4ad silence compiler warnings 2002-02-12 16:07:47 +00:00
Brian Paul
69d4ae7bb3 add new DOS files to tar file list 2002-02-12 03:28:48 +00:00
Brian Paul
db41d2ea8c Daniel Borca's new DOS/DJGPP driver. 2002-02-12 03:24:56 +00:00
Brian Paul
cc27365d77 Daniel Borca's GLUT for DOS/DGJPP. 2002-02-12 03:24:06 +00:00
Brian Paul
bcb148de92 added an assertion, fix typo 2002-02-06 03:22:47 +00:00
Brian Paul
2784dadafc fixed typo in depth_test_pixels(), should fix reported VTK failures 2002-02-06 03:22:00 +00:00
Brian Paul
c4afba36c3 fix evaluator data and matrix stack mem leaks (Robert Bergkvist) 2002-02-05 23:21:45 +00:00
Brian Paul
79c2f53491 Clean-up and remove dead code related to depth/stecil testing. 2002-02-04 15:59:29 +00:00
Brian Paul
ac8c241e64 removed references to removed source files 2002-02-02 21:41:58 +00:00
Brian Paul
b37a084357 Converted line drawing over to new span code, pb no longer used.
Big clean-up of line drawing code.
Removed many obsolete span processing functions.
2002-02-02 21:40:33 +00:00
Brian Paul
733a4b602b sw_span can now hold x/y arrays of fragment positions - getting ready to
ditch the pb (pixel buffer) code.
Converted point drawing, bitmaps and aa lines to use new span functions.
2002-02-02 17:24:11 +00:00
Brian Paul
ceb39f4f8d Clean-up and optimize alpha test code.
Major clean-up of pixel zoom code.
2002-01-31 00:27:43 +00:00
Brian Paul
e79de014c5 removed GLUT reference 2002-01-30 21:54:37 +00:00
Brian Paul
e0bafefd7a don't use affine/persp_textured_triangle funcs when CHAN_BITS > 8 2002-01-30 16:54:02 +00:00
Brian Paul
1cefc83a88 return GL_RENDERER = Mesa Offscreen16/32 when CHAN_BITS = 16 or 32 2002-01-30 16:53:03 +00:00
Brian Paul
eae38ca1b2 replace GLushort w/ GLubyte in DEST_4US template (fixes 16-bit GLchan problem 2002-01-30 16:52:02 +00:00
Brian Paul
6e1666437e Still more texture/span simplification and clean-up.
Updated comments, fixed indentation, etc.
2002-01-28 04:25:56 +00:00
Brian Paul
7956292a76 More span improvements. Removed _mesa_write_monocolor_span().
Removed last of span.filled* flags and Klaus's macros.
More simplification of triangle functions.
2002-01-28 03:42:28 +00:00
Brian Paul
f1e2369878 More span clean-up, mostly texture-related.
_mesa_rasterize_span() is gone, replaced by new _mesa_write_textured_span().
Removed some unneeded triangle functions - more simplification possible.
2002-01-28 00:07:33 +00:00
Brian Paul
2a182a9897 LOTS of changes, building upon Klaus's work.
struct sw_span is used throughout span/fragment processing.
This is leading to less code and more chances for optimization.
2002-01-27 18:32:03 +00:00
Brian Paul
6a731f343e added fog and raster Z position controls 2002-01-26 17:49:30 +00:00
Brian Paul
ad7e727024 more info about building for Motif 2002-01-25 16:05:31 +00:00
Brian Paul
6ee7a02852 added missing IsEnabled() cases for fog coord and secondary color arrays 2002-01-22 18:40:46 +00:00
Brian Paul
8bd13de4cc fixed array_cache.tag mistake 2002-01-22 18:37:05 +00:00
Brian Paul
4c8fadc6d9 Clean-up/renaming of the per-vertex attribute bits, specifically, the
VERT_BIT_* flags are new and used in many places (esp in T&L code).
Updated some comments for doxygen.
Various code clean-ups.
2002-01-22 14:35:16 +00:00
Brian Paul
9b681dcc17 added array_cache to TAGFILES 2002-01-22 14:31:09 +00:00
Brian Paul
2bc668d092 minor update 2002-01-21 21:21:22 +00:00
Brian Paul
ac9aa22174 files to support doxygen (source code documentation) 2002-01-21 19:29:55 +00:00
Brian Paul
2ef866d1fc Klaus's latest patches and some clean-up 2002-01-21 18:12:34 +00:00
Brian Paul
674012f083 updated gl_mangle.h (Ray Tice) 2002-01-18 14:55:40 +00:00
Brian Paul
9958ace401 new gl_mangle.h with korn shell script to regenerate itself from gl.h and glext.h (Ray Tice) 2002-01-16 23:51:09 +00:00
Brian Paul
658702df97 changed PB (pixel buffer) to use texcoord[4] array 2002-01-16 20:15:00 +00:00
Brian Paul
028fe46fc5 set PB->haveSpec in line functions that emit specular color 2002-01-16 18:22:19 +00:00
Brian Paul
72574b959c added another test in regions_overlap() (Klaus) 2002-01-16 16:04:50 +00:00
Brian Paul
78940758e9 latest changes from Klaus 2002-01-16 16:00:03 +00:00
Brian Paul
b311950dde added latest bug fixes 2002-01-16 15:45:54 +00:00
Karl Schultz
4197c0ea9b Fixes for 24-bit Windows devices. The old code was trying to do 3-byte
stores with a full DWORD store (yuk).  (Jeff Lewis)
2002-01-16 15:42:17 +00:00
Jouk Jansen
43df32e438 Committing in .
-Compile support for tests on OpenVMS
 -Fixed missing header file
 -Fixed missing return value on function return

 Modified Files:
 	Mesa/descrip.mms Mesa/tests/sharedtex.c
 Added Files:
 	Mesa/tests/descrip.mms
 ----------------------------------------------------------------------
2002-01-16 14:32:46 +00:00
Karl Schultz
40fac75370 get tests working on windows (Robert Bergkvist) 2002-01-16 01:03:25 +00:00
Karl Schultz
3d587f6432 Samples working for Windows (Robert Bergkvist) 2002-01-16 00:57:54 +00:00
Karl Schultz
164ce12202 Demo updates for Windows (Robert Bergkvist) 2002-01-16 00:48:43 +00:00
Karl Schultz
83356781e1 Removed missing files and added new ones (Robert Bergkvist) 2002-01-16 00:41:16 +00:00
Brian Paul
858b694b64 added some missing error checks 2002-01-15 21:49:57 +00:00
Brian Paul
25c5f1b448 Fixed Windows compile problem with gl__unused413() function. 2002-01-15 19:04:52 +00:00
Karl Schultz
2ff30b21bc Correct typo (vpstate.c) so that makefile works. 2002-01-15 18:41:53 +00:00
Karl Schultz
e19f5d7cb7 Remove phantom tab on a blank line to allow compile on IRIX. 2002-01-15 18:30:58 +00:00
Brian Paul
47507f4464 removed api_compat stuff 2002-01-15 18:27:33 +00:00
Karl Schultz
f2e5c19a2f Fixed pixel color component problem and clear code for 24-bit Windows
devices.  (Jeff Lewis)
2002-01-15 18:14:34 +00:00
Karl Schultz
807aea838b Remove trailing CR's. No logical changes. 2002-01-15 18:11:36 +00:00
Brian Paul
24f7c0c944 remove api_compat.c 2002-01-14 16:07:33 +00:00
Brian Paul
03c0c2e8aa Removed api_compat stuff, there's a better way.
Fixed FogCoord / SecondaryColor mix-ups in api_arrayelt.c
2002-01-14 16:06:35 +00:00
Brian Paul
fe9f62ff18 oops, missed vpstate.c 2002-01-14 15:47:10 +00:00
Brian Paul
7fc487d38b added vertex program sources 2002-01-14 15:46:19 +00:00
Brian Paul
1bb17ed0f2 added glReadPixels / scissor bug fix 2002-01-12 16:19:04 +00:00
Brian Paul
21cb88911a don't apply scissor box in read_fast_rgba_pixels() 2002-01-12 16:12:52 +00:00
Brian Paul
3e276d43a2 added some comments 2002-01-12 03:01:23 +00:00
Brian Paul
166718f749 updated some comments 2002-01-12 02:57:14 +00:00
Brian Paul
c6755aa6d5 set _NeedEyeCoords to zero if vertex program is enabled 2002-01-12 02:55:30 +00:00
Brian Paul
8e6d305c89 Changed gl_client_array's Enabled field to GLuint so it can actually
hold the flags we're storing in it!
2002-01-11 17:26:54 +00:00
Brian Paul
2edd1807f8 Moved _mesa_VertexAttribPointerNV into varray.c.
Removed dead placeholder functions from vpstate.[ch].
Changed gl_client_array's Enabled field to GLuint so it can actually
hold the flags we're storing in it!
Always do the switch (type) code in the vertex array functions to that
<type> gets error checked!
2002-01-11 17:25:35 +00:00
Brian Paul
9927f1978d Klaus's latest patches: change texcoord[3] to texcoord[4] everywhere 2002-01-10 16:54:28 +00:00
Brian Paul
2e99cbd953 init whole immediate struct to zero 2002-01-10 15:50:12 +00:00
Brian Paul
26c878ac16 added glTexEnviv bug fix 2002-01-09 02:16:58 +00:00
Brian Paul
0c5c1392ab fixed int->float conversion bug in _mesa_TexEnviv() 2002-01-09 02:14:29 +00:00
Brian Paul
a701a1445c added GL_REPLACE / GL_RGB texture bug fix 2002-01-09 00:30:01 +00:00
Brian Paul
35e5e89f56 fixed GL_REPLACE / GL_RGB bug 2002-01-09 00:27:49 +00:00
Brian Paul
8927fbe9c5 added GL_BLEND/texenv color bug fix 2002-01-09 00:14:13 +00:00
Brian Paul
fd1727bd10 texture env color wasn't used correctly in GL_BLEND mode 2002-01-09 00:09:33 +00:00
Brian Paul
d599190575 compile with -DNDEBUG 2002-01-08 15:58:32 +00:00
Brian Paul
97291208cb work-around for QNX compiler problem 2002-01-08 14:56:51 +00:00
Brian Paul
571a1ac6ee implemented vertex program point size control 2002-01-06 20:39:03 +00:00
Brian Paul
363049160d Another vertex program checkpoint: clean-up of vertex attribute storage
in vertex_buffer.   Improved vertex program pipeline stage such that
output registers can be processed in a loop.  Getting closer to where
we need to be in order to implement performance optimizations...
2002-01-06 03:54:12 +00:00
Brian Paul
e2053d1690 minor clean-ups 2002-01-05 21:58:42 +00:00
Brian Paul
bc42c19f22 infrastructure for vertex program attribute evaluators 2002-01-05 21:53:20 +00:00
Brian Paul
bd1a9dacf6 Vertex program checkpoint commit: converted all vertex attributes (color,
normal, texcoords, fogcoord, secondary color, etc) to GLfloat[4] datatype.
Aliasing of glVertex, glNormal, glColor, glFogCoord, etc. to glVertexAttrib
now complete.
2002-01-05 20:51:12 +00:00
Brian Paul
ca209ae1f9 comments, clean-ups, added lots of const qualifiers 2002-01-05 14:12:24 +00:00
Brian Paul
cab83b8aa9 comments, clean-ups, added lots of const qualifiers 2002-01-05 14:03:33 +00:00
Brian Paul
f48bfd66da test multitexture and vertex arrays 2002-01-04 23:00:19 +00:00
Brian Paul
714cdd88a4 added some assertions to exercise glIsTexture() 2002-01-04 21:05:57 +00:00
Brian Paul
5e1a4fdc3c added info about which drivers work and don't work 2002-01-04 14:42:35 +00:00
Brian Paul
8d0499b75e fix bug 498555 - test for __GNUC__ 2002-01-04 14:35:46 +00:00
Gareth Hughes
735d92029c - Clean up state bitmask.
- Add (somewhat broken) PolygonMode bit, toggles between GL_FILL and
  GL_LINE.  Somewhat useful in mimicking certain Viewperf tests.
2002-01-04 09:47:17 +00:00
Brian Paul
78c2aa0b51 regenerated from updated glsparcasm.py script 2002-01-03 16:35:08 +00:00
Brian Paul
efe2baadb8 don't use macros, just expand them in-line 2002-01-03 16:33:59 +00:00
Gareth Hughes
a0f923d286 Add missing items from .cvsignore files, tests/Makefile 2001-12-28 06:37:40 +00:00
Gareth Hughes
1fb0a43c16 Remove warnings about the difference between function pointers and
(void *) pointers.
2001-12-28 06:28:10 +00:00
Keith Whitwell
1a6f488908 add _compat_VertexAttrib4fNV 2001-12-21 15:48:23 +00:00
Karl Schultz
2391f4cec6 Define finite as _finite for Windows. 2001-12-20 18:59:39 +00:00
Keith Whitwell
fc00cbe8d1 Further help with dri libGL version skew 2001-12-20 15:30:45 +00:00
Keith Whitwell
1643203a93 Fix clipping problem on mga 2001-12-20 09:54:20 +00:00
Brian Paul
a359d3488a some display list support for vertex program extension 2001-12-19 02:36:05 +00:00
Brian Paul
3f9be68dc4 added separate specular bug fix to 4.0.1 list 2001-12-19 01:29:58 +00:00
Brian Paul
fa6b2fba7a fix a comment typo 2001-12-19 01:09:46 +00:00
Brian Paul
f47efb5ab3 have to clamp color+specular in _swrast_add_spec_terms_triangle()! (fixes Chimera bug) 2001-12-19 01:08:49 +00:00
Brian Paul
c6a14906c6 remove some cruft 2001-12-19 01:07:50 +00:00
Brian Paul
530da27edb bring 4.0.1 info into trunk 2001-12-18 14:08:23 +00:00
Brian Paul
30f51ae067 Replace old matrix stacks with new code based on struct matrix_stack.
Moved vertex program hash table into shared context state.
Implemented reference counting for vertex programs.
Replaced tnl "ProjectedClip" with "Ndc" (normalized device coordinates).
2001-12-18 04:06:44 +00:00
Brian Paul
645ced2955 disable prototype matrix stack code 2001-12-17 22:41:45 +00:00
Jouk Jansen
aea09490f5 Committing in .
Update OpenVMS makefile for vertex-routines
 #ifndef __VMS added for one print statement containing __FUNCTION__

 Modified Files:
 	Mesa/src/descrip.mms Mesa/src/tnl/t_imm_api.c
 ----------------------------------------------------------------------
2001-12-17 09:02:55 +00:00
Brian Paul
3ade8af7ff added some debug printfs (disabled) 2001-12-17 04:58:50 +00:00
Brian Paul
10f30eb438 first checkpoint commit of Klaus's new span code (struct sw_span) 2001-12-17 04:54:35 +00:00
Brian Paul
57d6e1aebf first checkpoint commit of Klaus's new span code (struct sw_span) 2001-12-17 04:47:57 +00:00
Brian Paul
c843a1a039 remove conditional in RESET_STIPPLE to fix conformance failure 2001-12-17 01:46:58 +00:00
Brian Paul
54772892bd updated vertex buffer identifiers 2001-12-16 11:28:20 +00:00
Brian Paul
c11120270c warp a quadmesh with a gravitational source via vertex program 2001-12-15 23:28:15 +00:00
Brian Paul
9cb3947c56 rotating, lit torus via vertex program 2001-12-15 22:33:59 +00:00
Brian Paul
e3a0f39824 divide by W and clipping now work - in pretty good shape now 2001-12-15 22:31:23 +00:00
Brian Paul
56790ced1a temporary hack for divide by W 2001-12-15 21:31:28 +00:00
Brian Paul
b15a3b4d13 better api trace/log messages 2001-12-15 16:42:59 +00:00
Brian Paul
d2237d48ec vertex program fixes 2001-12-15 02:14:43 +00:00
Brian Paul
c3d90f3211 disable debug printf's, fix a crash 2001-12-15 02:13:32 +00:00
Brian Paul
36c77a81ad free the NormalLengthPtr if non-null in _tnl_free_immediate() 2001-12-15 00:49:00 +00:00
Brian Paul
9745d47991 added newline characters to trace strings 2001-12-14 21:56:50 +00:00
Karl Schultz
5cbd179121 Use $(MAKE) on the irix targets, instead of hard-coding pmake,
as suggested in SF bug 482149.  People can still use
pmake -v -f Makefile.X11 if they want to use pmake (works great for me).
Sorry, this should have been in the last check-in.
2001-12-14 17:48:19 +00:00
Karl Schultz
92512085d5 Add .cc as a valid suffix. 2001-12-14 17:19:32 +00:00
Karl Schultz
16e2d94cc7 Cleanup for IRIX 6 platforms. Build src-glu instead of si-glu due
to problems with building the c++ code in the si-glu.
2001-12-14 17:14:45 +00:00
Karl Schultz
c589af2fe2 Fix up targets for
irix6-o32, irix6-o32-dso, irix6-n32, irix6-n32-dso
2001-12-14 16:42:23 +00:00
Karl Schultz
7c8db694cc Remove rules that were put into place to deal with compiling files that
are in subdirectories of this directory.  The list of rules that were here
was out of date for Mesa 4 and would likely get out of date again.  It is
better to have make handle it (e.g., use pmake -v on IRIX).
2001-12-14 16:35:55 +00:00
Brian Paul
1668d4bab8 s/glxGetProcAddress/glXGetProcAddressARB/ 2001-12-14 11:40:14 +00:00
Brian Paul
eaf0eac7d3 oops, wrong value for GLX_SAMPLES 2001-12-14 03:19:06 +00:00
Brian Paul
b70f5c21e7 added GLX_SAMPLE_BUFFERS, GLX_SAMPLES 2001-12-14 03:18:08 +00:00
Brian Paul
15d4a2327d minor tweaks 2001-12-14 03:17:00 +00:00
Brian Paul
a19d7c35cd 4.1 extensions 2001-12-14 03:16:06 +00:00
Brian Paul
1d1635d27b planned extensions for 4.1 2001-12-14 03:14:49 +00:00
Brian Paul
b638c34381 minor dispatach table changes 2001-12-14 03:13:04 +00:00
Brian Paul
797ea81d63 vertex program test program 2001-12-14 03:03:38 +00:00
Brian Paul
86b842790b vertex program check-in 2001-12-14 02:50:01 +00:00
Brian Paul
680522f74c add dispatch offsets for vertex program functions 2001-12-14 02:48:10 +00:00
Karl Schultz
faaa88fc48 Remove const from save_TexParameteri to match prototype for glTexParameteri.
Allows compilation on IRIX.
2001-12-13 19:58:20 +00:00
Karl Schultz
d313068dc8 Added missing entry points 2001-12-13 19:15:58 +00:00
Brian Paul
d9331ae71e fixed errors in feedback for glDraw/CopyPixels and glBitmap 2001-12-13 19:12:42 +00:00
Brian Paul
59235bd5da special case blend optmizations (Jeremy Fitzhardinge) 2001-12-13 16:14:26 +00:00
Brian Paul
c3209d45ad call FLUSH_VERTICES() in _mesaTexParameterfv() (bug 491832) 2001-12-13 16:02:11 +00:00
Keith Whitwell
5246b6c9d1 fix for ubyte colors 2001-12-13 10:51:41 +00:00
Keith Whitwell
59e5b90452 fix primitive calculation in 1-line dlist immediates (molecules) 2001-12-13 10:49:04 +00:00
Keith Whitwell
09fc9324f6 fix glut tess lockup 2001-12-11 15:13:57 +00:00
Brian Paul
74df2ef732 added enums for GL_ARB_depth_texture/shadow/shadow_ambient (temporary) 2001-12-05 22:01:13 +00:00
Keith Whitwell
ef4f5b391e add inf and nan tests to swrast functions 2001-12-05 10:24:31 +00:00
Brian Paul
aecfb51c30 fixed potential array overwrite problem 2001-12-04 23:45:31 +00:00
Brian Paul
014ec1ac5e prototype implementation of GL_ARB_depth_texture, GL_ARB_shadow, GL_ARB_shadow_ambient 2001-12-04 23:44:55 +00:00
Brian Paul
471a774f43 dispatch changes to minimize hassle with XFree86 libGL 2001-12-04 23:43:31 +00:00
Keith Whitwell
c34cb25bdd further tweak to dlist change 2001-12-04 13:04:29 +00:00
Keith Whitwell
aa46094ca6 guard ResetStipple calls 2001-12-03 17:48:58 +00:00
Keith Whitwell
4ea18fc2dc fx another place where PRIM_PARITY is calculated 2001-12-03 17:47:04 +00:00
Keith Whitwell
a8b25ada45 simplify drawarrays paths 2001-12-03 17:41:58 +00:00
Keith Whitwell
3a825a85f1 avoid side-effects in macro param 2001-12-03 17:39:12 +00:00
Keith Whitwell
bfd2ae6e99 correctly reset input after dlist execution 2001-12-03 17:19:14 +00:00
Karl Schultz
e6373ba6d7 Corrected bad line breaks in macro definitions within code compiled
when BEOS_THREADS is defined.  This usually does not cause a problem when
BEOS_THREADS is not defined, but the bad line break in this case put
the "#name" text as the first non-white space in a line, causing the
IRIX C preprocessor to think that it was a preprocessor directive, and
that generated a distracting warning.  I also fixed a couple of other
line breaks that seemed wrong to me.
2001-11-30 22:11:45 +00:00
Karl Schultz
3ac348c17a Add darwin target 2001-11-30 19:41:19 +00:00
Karl Schultz
fcc0abe6cf malloc() prototype is in stdlib.h for darwin 2001-11-30 19:35:22 +00:00
Alan Hourihane
bce1689d5b Don't reset _tnl_CurrentInput when in DestroyContext. 2001-11-30 15:43:53 +00:00
Karl Schultz
7b2a146d3a main trunk is now 4.1 2001-11-29 23:13:12 +00:00
Karl Schultz
209e1348bd update to version 4.0 2001-11-29 22:54:33 +00:00
Karl Schultz
8ff271548a Update notes on si-glu NURBS. 2001-11-29 16:55:37 +00:00
Karl Schultz
9c8cbe6950 Fix compilation errors and warnings for NURBS support. (Robert Bergkvist) 2001-11-29 16:16:55 +00:00
Keith Whitwell
4e6c835210 use smaller buffer when decomposing large drawarrays, for cache goodness 2001-11-29 15:15:20 +00:00
Brian Paul
d8af040f5e updated comment about CHAN_BITS 2001-11-28 17:18:36 +00:00
Brian Paul
e4eba73060 use v2 color, not v0 in flat_ci_triangle() 2001-11-28 16:11:32 +00:00
Brian Paul
253270dfcc use glXGetProcAddressARB to avoid extension linkage problems 2001-11-27 02:55:58 +00:00
Brian Paul
2f3d620398 don't directly call glSecondaryColor*EXT() or glFogCoord*EXT() 2001-11-27 00:05:35 +00:00
Brian Paul
70c05e6781 don't use near and far for parameter names 2001-11-26 23:41:24 +00:00
Karl Schultz
20517ce040 avoid using near and far as variable names since they are reserved words
in the windows compiler.
2001-11-26 22:55:28 +00:00
Brian Paul
1b2976f79b fix some warnings 2001-11-26 17:21:46 +00:00
Keith Whitwell
f660ec6ff8 Possible fix for vtk tristrip bug 2001-11-26 12:56:07 +00:00
Brian Paul
358ed73e1d fix for bug 474479, remove Trace/* stuff 2001-11-23 20:44:12 +00:00
Brian Paul
3183af39d0 fixed bug 484142, missing backslash 2001-11-23 20:09:26 +00:00
Keith Whitwell
cbf9731119 Another locked drawarrys fix 2001-11-22 09:23:36 +00:00
Brian Paul
d4ece7b2f4 minor update 2001-11-21 17:21:41 +00:00
Keith Whitwell
d3be982783 3dnow normalize_normals broken, disable 2001-11-19 13:52:41 +00:00
Keith Whitwell
3f766b7a89 possible fix for cva ignore start index bug 2001-11-19 10:22:41 +00:00
Brian Paul
71340e861e More span rendering optimizations from Klaus Niederkrueger 2001-11-19 01:18:28 +00:00
Brian Paul
71515b9175 added test implementation of GL_ARB_window_pos 2001-11-19 00:41:32 +00:00
Brian Paul
6d9b899342 fixed a glitch 2001-11-19 00:40:33 +00:00
Brian Paul
50c31d6861 added test implementation of GL_ARB_window_pos 2001-11-19 00:13:45 +00:00
Brian Paul
5b7dab2e4c added test implementation of GL_ARB_window_pos 2001-11-18 23:52:37 +00:00
Brian Paul
17fe22d3bf test for glXGetProcAddress() 2001-11-18 23:16:56 +00:00
Brian Paul
a6fdefa322 remove -DMESA_TRACE from linux-debug config 2001-11-18 23:11:45 +00:00
Brian Paul
94dd6b8927 remove Glide and SVGA support from mesa-debug config 2001-11-18 23:03:53 +00:00
Brian Paul
a6a997c234 included by glapi.c 2001-11-18 22:52:22 +00:00
Brian Paul
b5fd886ee1 API dispath updates 2001-11-18 22:48:11 +00:00
Brian Paul
4fe0f9d2a9 new, simpler API specification file 2001-11-18 22:43:16 +00:00
Brian Paul
6c0d72f9c0 new Python API generator scripts 2001-11-18 22:42:57 +00:00
Brian Paul
199b931c07 added missing const to glXGetContextIDEXT() prototype 2001-11-18 22:16:07 +00:00
Brian Paul
0ee6a5604d improved AA subpixel sample positions (Ray Tice) 2001-11-13 00:26:39 +00:00
Brian Paul
1b37d6c305 BeOS thread support (Philippe Houdoin) 2001-11-12 23:50:12 +00:00
Brian Paul
cd060fc3b4 fix typedef problem found with MSDev 6.0 2001-11-09 22:04:24 +00:00
Brian Paul
c32fe22168 added GLX 1.4 function manglers 2001-11-09 22:01:02 +00:00
Brian Paul
853a4abab2 added 1.3 function manglers 2001-11-09 22:00:53 +00:00
Brian Paul
fe9b705a2c define GL_VERSION_1_3 (doh!) 2001-11-09 21:54:30 +00:00
Brian Paul
4b7ccad682 casts to silence warnings from gcc 2.96 2001-11-06 16:01:19 +00:00
Brian Paul
87c964d388 added missing GL_MAX_TEXTURE_LOD_BIAS_EXT query 2001-11-06 15:53:00 +00:00
Brian Paul
85e7d7c1d8 fix error in error checking conditional (bug 476846) 2001-11-03 04:11:26 +00:00
Brian Paul
dc31d67c0e init the hash table mutex in _mesa_NewHashTable (Won-Suk Chun) 2001-11-02 00:57:04 +00:00
Karl Schultz
acf0c0a1e1 Updates for improved DirectDraw support (Daniel Slater) 2001-11-01 22:44:47 +00:00
Brian Paul
52ef4cc59a added some (void *) casts to silence gcc 2.96 warnings 2001-11-01 00:39:24 +00:00
Karl Schultz
9baad8e1ff Change name of glut lib from glut32 to MesaGlut.
This helps avoid confusion with other gluts on the system that may be
lined with OpenGl32.dll and Glu32.dll.
2001-10-26 21:21:11 +00:00
Karl Schultz
b10f995edf Copy the readtex.[ch] files from ../util 2001-10-26 21:01:45 +00:00
Brian Paul
a4b42200e9 added a bunch of missing breaks for multisample gets 2001-10-25 23:21:28 +00:00
Brian Paul
0878456b46 template for 4.1 release notes 2001-10-22 22:57:23 +00:00
Brian Paul
3de5462ab1 version bumps, etc for 4.1 2001-10-22 22:45:18 +00:00
Brian Paul
a7f8117153 added latest bug fixes 2001-10-22 16:04:46 +00:00
Brian Paul
45d21ca587 applied Andrew Lewycky's patches 2001-10-22 01:21:16 +00:00
Keith Whitwell
52d4c6ebb5 forgotten diffuse alpha fix 2001-10-20 00:13:45 +00:00
Jouk Jansen
12e875ce4d Committing in .
Modified Files:
 	Mesa/src/context.c

 Initializing ctx->Driver.CurrentExecPrimitive to 0, just after the allocation
 of the context. I hope this solved a very rare crash of the molecule mode
 of xlockmore on my VMS-machine. (I have not seen any crash the last week.
 Normally it crashed at least once in the 3 days)

----------------------------------------------------------------------
2001-10-18 08:04:57 +00:00
Brian Paul
5d26219288 added a few comments 2001-10-17 23:03:56 +00:00
Brian Paul
40ba618a6f warning fixes (Karl Schultz) 2001-10-17 23:03:34 +00:00
Brian Paul
e8245c1409 added some missing Win32 files to tar file list 2001-10-17 20:44:26 +00:00
Brian Paul
ebc8b0aa5a minor updates 2001-10-17 14:59:21 +00:00
Brian Paul
7d63ac1e6b removed src/mms_depend from tar file list 2001-10-17 14:57:16 +00:00
Brian Paul
fca1ce3a26 added new entrypoints for 1.3 2001-10-17 14:33:05 +00:00
Brian Paul
e715c91000 updated for new glext.h 2001-10-17 13:34:08 +00:00
Brian Paul
e11f089f82 added GL_ARB_texture_mirrored_repeat 2001-10-17 13:31:07 +00:00
Brian Paul
470d3cd4a2 minor updates for new glext.h 2001-10-17 13:29:02 +00:00
Brian Paul
3d16c369d9 updated extensions 2001-10-17 13:28:14 +00:00
Karl Schultz
b5bfe2f6ae Updated for Mesa 4.0 2001-10-15 20:38:12 +00:00
Karl Schultz
439ded4e2a Fix comments. 2001-10-15 17:28:53 +00:00
Karl Schultz
b66103971c Fix the clear() function
- add checks for the ColorMask and IndexMask (like osmesa)
- correctly handle the DD_*_BIT flags so that we don't also ask the
  swrast to clear the color buffer after we cleared it ourselves. (doh!)
  This gives nearly a 2X improvement in the frame rate in a program like
  gears.
2001-10-05 15:47:28 +00:00
Karl Schultz
bffae58175 Allow to compile in Windows. 2001-10-04 19:14:26 +00:00
Karl Schultz
3978d026ea Build a few demos that now work with Windows. 2001-10-04 19:13:36 +00:00
Karl Schultz
8f47563559 Need to define MESA_DEBUG in debug builds. Otherwise, NDEBUG gets
defined, which is bad for things like assert().
2001-10-04 19:06:31 +00:00
Karl Schultz
47bcda78e2 Updated Windows driver for Mesa 4.0.
Needs optimization.
2001-10-04 19:04:56 +00:00
Karl Schultz
d3788b60ae remove extra CR chars 2001-10-04 19:03:11 +00:00
Keith Whitwell
31c40f0905 use correct vertex for flatshading 2001-09-25 17:38:11 +00:00
Karl Schultz
954f511473 Fix up Windows makefiles so that the debug build leaves debugger info
in the libraries.  Make with NODEBUG=1 builds optimized without debug
info (doc'ed in top level Makefile.win).
2001-09-25 16:25:41 +00:00
Karl Schultz
968e557dcd disable some more code so that it compiles quietly on Windows. 2001-09-25 16:22:40 +00:00
Brian Paul
b1ee387ab5 replaced x86_xform_raw4.S with x86_xform4.S 2001-09-24 19:18:03 +00:00
Karl Schultz
220e77a3f7 use OSMESA_* enums for OSMesaCreateContext instead of GL_*. 2001-09-24 15:29:27 +00:00
Brian Paul
0e94067d0d removed duplicate GLX_AUX_BUFFERS_BIT definition 2001-09-24 14:15:58 +00:00
Jouk Jansen
001f826f71 Committing in .
Modified Files:
 	Mesa/si-glu/libutil/glue.c

 added some type casts to silence compiler warnings.

----------------------------------------------------------------------
2001-09-24 09:40:40 +00:00
Brian Paul
2427575c21 [rgba]shift values weren't always correct, only effected blended lines 2001-09-23 21:17:03 +00:00
Brian Paul
7bb6fcc19d added missing tnl_dd files 2001-09-23 18:32:51 +00:00
Brian Paul
5734421078 4.0 updates 2001-09-23 18:19:30 +00:00
Brian Paul
97856fd98a updated version info 2001-09-23 16:53:28 +00:00
Brian Paul
5ac8282a22 fixed some configure;make build problems. cleaned-up copyright info. 2001-09-23 16:50:01 +00:00
Brian Paul
a573803ed3 updates for Mesa 4.0 2001-09-23 16:10:02 +00:00
Brian Paul
78a03d3c45 bump versions to 4.0 2001-09-23 16:06:13 +00:00
Keith Whitwell
497d6eab66 More of the same 2001-09-23 15:19:16 +00:00
Karl Schultz
05ba9becc3 Make osmesa a DLL instead of a static lib (Windows). This is more
consistent with the other modules and platforms.  It also makes the
API and linkage on Windows more consistent.
2001-09-21 21:32:14 +00:00
Karl Schultz
445e3cbd0d Add GLAPIENTRY to typedef for callback functions (used by tessellator).
This is important now that we're using __stdcall instead of the (default)
__cdecl on WIN32.  This gets apps using the tessellator working again
on Windows.
2001-09-21 20:39:03 +00:00
Brian Paul
38112f5b60 added __glCoreCreateContext and __glCoreNopDispatch 2001-09-21 17:23:30 +00:00
Karl Schultz
80d5855692 add the same conditional mangling stuff that gl.h has. 2001-09-20 22:19:41 +00:00
Karl Schultz
448b88bb80 add mangling for new entry points 2001-09-20 22:18:47 +00:00
Karl Schultz
cfe52d8ae0 Don't use "errno" as a parameter name - it is also a function and that
confused the Windows compiler.  Also make messages unsigned char for
consistency.
2001-09-20 21:50:53 +00:00
Karl Schultz
f2a50b141e compiler warnings 2001-09-20 21:47:52 +00:00
Karl Schultz
8674e709ee Change UnProject4 prototype to use nearVal and farVal instead of near
and far because Windows compiler can get confused over these old keywords.
2001-09-20 20:47:26 +00:00
Keith Whitwell
62eb2e5909 very brief overview of swrast 2001-09-20 19:25:31 +00:00
Keith Whitwell
fffc27015b (very) Brief overview of tnl module 2001-09-20 18:59:05 +00:00
Brian Paul
7152305e0a GL_ADD texture mode was incorrect, renamed some vars 2001-09-19 22:21:13 +00:00
Karl Schultz
7c4268176e silence compiler warnings (last batch for src) 2001-09-19 20:30:44 +00:00
Brian Paul
2fc06af470 set GR_STWHINT_ST_DIFF_TMU1 flag in the init() function (fixes multiarb demo) 2001-09-19 03:37:16 +00:00
Brian Paul
b6bcfc1f6a fix fallback for stippled polygons, removed a debug message 2001-09-19 02:55:45 +00:00
Brian Paul
37f2d5e696 compute dst->ooz, not dst->z in clip interpolation function 2001-09-19 02:54:56 +00:00
Karl Schultz
7b9fe820a3 more compiler warning fixes 2001-09-18 23:06:14 +00:00
Keith Whitwell
c98541f54b remove some debug 2001-09-18 22:07:54 +00:00
Keith Whitwell
e9479f24ab Fix FX driver to the point where gears & morph3d work.
Textures are broken (eg. isosurf).
2001-09-18 22:05:36 +00:00
Karl Schultz
573dd2206b clean up makefiles some more for Windows 2001-09-18 20:47:23 +00:00
Karl Schultz
4742735a5c compiler warnings 2001-09-18 16:51:45 +00:00
Karl Schultz
b14dcea418 remove carriage return chars 2001-09-18 16:39:38 +00:00
Karl Schultz
94a6ec8f0c compiler warnings 2001-09-18 16:16:21 +00:00
Karl Schultz
57c946096e compiler warnings 2001-09-18 15:27:18 +00:00
Brian Paul
fde5e2c5f1 more warning fixes (Karl Schultz) 2001-09-15 18:02:49 +00:00
Brian Paul
1f20952a92 removed carriage return chars 2001-09-15 18:00:28 +00:00
Brian Paul
04120f6cce Win32 updates (Karl Schultz) 2001-09-14 22:19:18 +00:00
Brian Paul
7c276329e8 more warning fixes (Karl Schultz) 2001-09-14 21:36:43 +00:00
Brian Paul
edf8c06270 more warning fixes (Karl Schultz) 2001-09-14 21:30:31 +00:00
Brian Paul
7cc49c2dc8 silence more warnings (Karl Schultz) 2001-09-14 17:23:39 +00:00
Brian Paul
5ce1f374da silence minor warnings 2001-09-14 17:00:42 +00:00
Brian Paul
675343c517 replaced gets() with fgets() 2001-09-14 02:59:08 +00:00
Brian Paul
94666c4b55 more GL 1.3 updates 2001-09-14 02:48:53 +00:00
Brian Paul
ba57e5297d more GL 1.3 and GLX 1.4 updates 2001-09-14 02:43:03 +00:00
Brian Paul
dcbe4d6d2f minor optimizations for flat shading (Klaus Niederkrueger) 2001-09-13 22:12:54 +00:00
Brian Paul
d22554d2ce replaced some tabs with spaces 2001-09-13 21:54:29 +00:00
Brian Paul
097d2a025e minor re-org 2001-09-12 03:32:29 +00:00
Brian Paul
e79f4b08d5 hook compressed texture functions into driver 2001-09-12 03:30:02 +00:00
Brian Paul
517903edcd add new WindML/Mesa man pages to tar file list 2001-09-10 19:28:22 +00:00
Brian Paul
306933046c WindML updates (Stephane Raimbault) 2001-09-10 19:21:13 +00:00
Brian Paul
30230a9cd1 fixed s/w alpha bug 458411 2001-09-10 18:53:45 +00:00
Jouk Jansen
9348cfc6e8 Committing in .
Modified Files:
 	Mesa/src/tnl/t_imm_alloc.c

 added initialization for Normals

----------------------------------------------------------------------
2001-09-07 06:55:59 +00:00
Brian Paul
190d34874c minor changes, prototype Pbuffer support 2001-09-01 20:27:31 +00:00
Brian Paul
62f75054cb update version to 3.5.1, minor OSMesa changes 2001-09-01 20:26:51 +00:00
Brian Paul
7d5656bee7 prototype work for Pbuffer support 2001-09-01 20:23:25 +00:00
Brian Paul
7e975ba3aa added GLX_RGBA_TYPE, fixed GLX_LARGEST_PBUFFER typo 2001-09-01 20:17:16 +00:00
Brian Paul
9bed64cbf1 fixed dangling pointer problem (Chris Burghart) 2001-08-31 04:30:14 +00:00
Brian Paul
04ec0fd71e changes to allow the driver to compile - still doesn't work though 2001-08-29 03:58:42 +00:00
Brian Paul
a0037ad8b3 added OSMESA_MAX_WIDTH/HEIGHT queries 2001-08-28 23:12:37 +00:00
Brian Paul
a07e02fd01 version 3.5.1 updates 2001-08-28 22:54:47 +00:00
Brian Paul
0d6fd15840 minor updates regarding OpenGL 1.3 2001-08-28 22:53:44 +00:00
Brian Paul
a8b07a539b added OpenGL 1.3 tokens and prototypes 2001-08-28 22:49:32 +00:00
Brian Paul
2a88946f9a OpenGL 1.3 support 2001-08-28 22:46:22 +00:00
Brian Paul
afe4f5e6c1 simple multi-window GLUT test prog 2001-08-21 14:25:31 +00:00
Gareth Hughes
e7df7cd6ad Get rid of unfinished demo. 2001-08-21 05:42:11 +00:00
Brian Paul
c123a9b2ed removed a semicolon in the USE() macro 2001-08-20 21:45:15 +00:00
Brian Paul
9babb73789 added textured line bug fix 2001-08-20 16:45:02 +00:00
Brian Paul
d9fc8e20e3 bumped version string to 3.5.1 2001-08-20 16:44:43 +00:00
Brian Paul
ac6daf97e1 better error messages 2001-08-20 16:43:02 +00:00
Brian Paul
df631a866d better error reporting 2001-08-20 16:42:40 +00:00
Brian Paul
233aafbb30 new debugging code 2001-08-20 16:41:47 +00:00
Brian Paul
fc1eadefeb added WindML driver 2001-08-20 16:16:36 +00:00
Brian Paul
976c26ca34 WindML driver (Stephane Raimbault) 2001-08-20 16:07:10 +00:00
Brian Paul
60174c1aef Fixes for 32-bit GLchans: smooth/flat/textured triangles seem to work now. 2001-08-14 14:08:44 +00:00
Keith Whitwell
76a52525c7 Reenable, but only in the size four case... 2001-08-14 00:59:08 +00:00
Keith Whitwell
bd9b4056d7 Undo last change - breaks other stuff. 2001-08-14 00:52:47 +00:00
Keith Whitwell
3d1df5554e Compute first partials before taking cross product to calculate normal.
Fixes diego santa cruz' nurbs lighting bug.
2001-08-14 00:50:44 +00:00
Brian Paul
9a90775010 replace PI with pi 2001-08-13 22:36:31 +00:00
Keith Whitwell
b1a2393bb7 Fix problem with colormaterial (bug #441859) 2001-08-13 22:17:19 +00:00
Keith Whitwell
c8a27838a0 Removed optimizations (this code is now seldom used) 2001-08-13 22:15:54 +00:00
Brian Paul
d922109eb3 added GL_EXT_texture_edge_clamp 2001-08-13 18:09:34 +00:00
Brian Paul
978a2a0a43 fixed Solaris compilation problems (Bug 441817) 2001-08-13 16:52:18 +00:00
Brian Paul
2e5a20ae21 rm .lo .la files for make clean 2001-08-13 16:51:08 +00:00
Brian Paul
b22fe91cdb removed ss_interp.c 2001-08-13 16:37:44 +00:00
Brian Paul
8b59b52297 added latest 3.5.1 bug fixes 2001-08-07 23:13:54 +00:00
Brian Paul
58cfa0fd90 fixed a glPush/PopAttrib bug related to texture binding (reported by Wes Bethel) 2001-08-07 23:10:55 +00:00
Brian Paul
c6182ab54c fixed bug in DEST_4F template function 2001-08-07 22:16:06 +00:00
Brian Paul
94f494e780 removed some now bogus assertions (due to Klaus's latest optimization) 2001-08-07 22:05:11 +00:00
Brian Paul
ebc9f221b2 fixed NewState update bugs in _mesa_PopClientAttrib() 2001-08-07 21:46:52 +00:00
Brian Paul
b5797a5085 Win32 fixes, etc. (Gerk Huisma) 2001-08-07 17:34:10 +00:00
Brian Paul
696cd3d2b6 optimization to sample_lambda_2d() (Klaus Niederkrueger) 2001-08-07 17:26:10 +00:00
Brian Paul
bb40d07830 added GLX context share bug fix 2001-08-07 16:02:48 +00:00
Brian Paul
5e1680ce1d fixed GLX context sharing bug (reported by Eric Plante) 2001-08-07 16:01:34 +00:00
davem69
636fb6cae7 Use #function instead of @function
in .type directive so it works with Solaris
assembler as well as GNU assembler.
2001-08-03 13:16:31 +00:00
Keith Whitwell
84170351db Fix VERT_RGBA special case. 2001-08-03 00:16:36 +00:00
Keith Whitwell
76ca0f5232 Fix SGL testLights.exe bugs (interaction of copying and fixup in display lists) 2001-08-02 22:39:51 +00:00
Keith Whitwell
554ceab8ec Fix SGL testGeoSets.exe polygon mode problem (wrong interpretation of
count parameter in DrawArrays)
2001-08-02 21:30:10 +00:00
Keith Whitwell
51184566fb Fix SGL monoindexed bug (glDrawRangeElements in dlist) 2001-08-02 19:58:07 +00:00
Keith Whitwell
c618005dcf Fix copying problem (light spots) on evaluated surfaces. 2001-08-01 05:10:42 +00:00
Keith Whitwell
3670e206a7 Fix core in fixup_normal_lengths 2001-07-28 21:04:21 +00:00
Keith Whitwell
46af1f87c8 Remove _BaseAlpha, fix reflect lighting bug. 2001-07-28 19:28:49 +00:00
Brian Paul
616f470629 more GLAPIENTRY fixes (Karl Schultz) 2001-07-27 19:09:58 +00:00
Brian Paul
2f65b316ff added latest 3.5.1 bug fixes 2001-07-27 14:49:08 +00:00
Brian Paul
8a8d474068 undo previous check-in (restore the @ symbols) 2001-07-27 14:38:17 +00:00
Brian Paul
dae1774e20 check if deleting _Current texobj in _mesa_DeleteTextures (Bart Barenbrug) 2001-07-27 14:30:50 +00:00
Brian Paul
086f1b8428 added four missing GLX 1.3 tokens 2001-07-27 14:26:27 +00:00
Brian Paul
24d9350897 replaced @ with ## or # to allow compilation on SunOS 5.6 (Bug 442742) 2001-07-27 14:06:35 +00:00
Brian Paul
73fc243420 wglUseFontBitmapsA() update (Frank Warmerdam) 2001-07-27 14:03:55 +00:00
Brian Paul
172281dad8 fixes for proxy cube map texture images 2001-07-26 20:02:10 +00:00
Brian Paul
e2df5de01c use GLAPIENTRY when declaring a couple function pointers (Gerk Huisma) 2001-07-26 16:04:10 +00:00
Brian Paul
d4cff4f2fa Applied Klaus Niederkrueger's latest flat-shading clean-ups and some of my own. 2001-07-26 15:57:49 +00:00
Brian Paul
bbf6a41d2f GLchan and GL_ADD clamping changes (Klaus Niederkrueger) 2001-07-23 16:47:53 +00:00
Brian Paul
62c734f499 don't make default teximage if glTexImage's pixels=NULL (Gerk Huisma) 2001-07-23 16:18:18 +00:00
Brian Paul
ae40b2281d rename ERROR macro to TE_ERROR (Gerk Huisma) 2001-07-23 16:10:03 +00:00
Brian Paul
3c03f3232d fix some Win32 warnings (Gerk Huisma) 2001-07-23 16:08:59 +00:00
Brian Paul
4fa5c1966a don't clamp colors if GLchan==GLfloat in add_colors() 2001-07-23 16:08:19 +00:00
Brian Paul
55180f4b92 GLubyte -> GLchan change 2001-07-23 16:07:39 +00:00
Brian Paul
f3b85c983f check for pixels=NULL in _mesa_store_teximage[123]d() 2001-07-23 16:07:12 +00:00
Brian Paul
89480f7382 added vms_x_fix.h to tar file list 2001-07-23 15:09:52 +00:00
Jouk Jansen
46e6c7ad54 Committing in .
Modified Files:
 	Mesa/si-glu/libtess/memalloc.h

 malloc.h is non-standard on OpenVMS. If it is present it only includes
 stdlib.h. therefore for VMS malloc.h is replaced by stdlib.h.
----------------------------------------------------------------------
2001-07-20 11:20:32 +00:00
Brian Paul
48f3bdaeb3 GLchan changes 2001-07-19 16:12:03 +00:00
Brian Paul
fd28445e10 Added Win32 memory debugging and fixed a few memory leaks (Gerk Huisma) 2001-07-19 15:54:34 +00:00
Brian Paul
2a9eca0ed4 do some 16-bit GLchan computations in floating point (Gerk Huisma) 2001-07-18 14:10:51 +00:00
Jouk Jansen
3b925120a6 Committing in .
Modified Files:
 	Mesa/si-glu/libnurbs/interface/glcurveval.cc

 Corrected declaration of putCallBack

----------------------------------------------------------------------
2001-07-18 11:17:35 +00:00
Keith Whitwell
277fd2e66e Fix Alan Barnett's 'try10' display list bug. 2001-07-17 21:44:37 +00:00
Keith Whitwell
5356031129 Lighting now emits colors as CHAN_TYPE, as it used to. This will require
minor adjustments in the dri drivers for twosided lighting to work again.
2001-07-17 19:39:32 +00:00
Brian Paul
4ae22b9721 include glu.h 2001-07-17 15:39:13 +00:00
Brian Paul
461b990508 disable MMX blend code until it gets fixed 2001-07-16 20:45:55 +00:00
Brian Paul
a1503b00f8 Various 16-bit GLchan fixes and Win32 fixes (Gerk Huisma) 2001-07-16 15:54:23 +00:00
Brian Paul
fba5e95468 assorted fixes for Win32 (Gerk Huisma) 2001-07-16 15:46:42 +00:00
Brian Paul
96385fa155 more work on float colors (still not finished) 2001-07-14 17:53:04 +00:00
Brian Paul
274fc30d31 added latest 3.5.1 bug fixes 2001-07-14 16:30:56 +00:00
Brian Paul
ac3958ea1b removed unused tiny triangle test code 2001-07-14 16:05:44 +00:00
Brian Paul
ee6cf4c6b0 undo previous check-in (unfinished code) 2001-07-13 20:12:44 +00:00
Brian Paul
601ce1d624 minor tweaks 2001-07-13 20:09:18 +00:00
Brian Paul
5b22aa1e33 added linux-osmesa32 config 2001-07-13 20:08:42 +00:00
Brian Paul
f431a3fb4d assorted changes for supporting GLfloat color channels (not done) 2001-07-13 20:07:37 +00:00
Brian Paul
bc07a99cc3 replaced __inline with INLINE 2001-07-13 17:26:39 +00:00
Brian Paul
cff1cfd90d silence an uninitialized var warning 2001-07-13 16:39:19 +00:00
Brian Paul
5c749d9e3c silence a warning 2001-07-13 16:38:44 +00:00
Brian Paul
b23f5b5a5c replace _NEW_PIXEL with _IMAGE_NEW_TRANSFER_STATE to catch color matrix changes 2001-07-13 15:44:21 +00:00
Brian Paul
77a4754d73 fixed two bad casts (Stephane Conversy) 2001-07-13 15:24:34 +00:00
Jouk Jansen
0cab1db776 Committing in .
Modified Files:
 	Mesa/src/descrip.mms Mesa/src/FX/fxtris.c Mesa/src/FX/fxvb.c

 -updated OpenVMS makefile
 -fixed compilation if FX is NOT defined.
----------------------------------------------------------------------
2001-07-13 11:28:07 +00:00
Keith Whitwell
1182ffeec3 Rename some of the tnl->Driver.* functions to tnl->Driver.Render.*, to make it
clear that these are owned by t_vb_render.c.

Make swrast_setup opaque - it now hooks itself directly into
tnl->Driver.Render.*.  Add a _swsetup_Wakeup() call that does this.

Update X11 (tested), osmesa and FX drivers for this change.

FX compiles but is probably broken as the changes there are large.  It was the
only remaining driver that used the internal _swsetup_ functions for
interp and copy_pv.  This usage has been replaced with code from the DRI
tdfx driver.
2001-07-12 22:09:21 +00:00
Brian Paul
fae7b778b8 fixed flat shading bug in affine_ and persp_textured_triangle() functions 2001-07-09 16:24:30 +00:00
Brian Paul
571c8ecc8f added missing \'s 2001-07-09 16:16:20 +00:00
Brian Paul
ac54173414 fixed segfault (NULL _ShineTable[0]) in shade_rastpos() 2001-07-05 15:31:21 +00:00
Brian Paul
5233ca8d30 fixed logic error in OSMesaMakeCurrent() for 565 pixel support (Lars Andersson) 2001-07-05 15:12:13 +00:00
pesco
8564f0536b More .cvsignore updates. 2001-07-02 11:41:02 +00:00
Keith Whitwell
47a28c0b4d restore normal length optimization in dlists 2001-06-28 17:34:14 +00:00
Brian Paul
206eda8b69 support for RGB_565 pixels (Lars Andersson), untested 2001-06-27 13:56:17 +00:00
Keith Whitwell
9c38ae35eb Add -f to rm in make clean to avoid error messages 2001-06-27 12:52:12 +00:00
Brian Paul
acc722d4b8 More raster fog coord fixes.
New truncate vs. floor comments in drawpixels.c
Added current raster secondary color state, not used yet.
2001-06-26 21:15:35 +00:00
Brian Paul
33170eeb18 optimized texture triangle updates (Klaus Niederkrueger) 2001-06-26 15:33:28 +00:00
Brian Paul
4f76d0e215 added initial 3.5.1 info 2001-06-26 01:33:15 +00:00
Brian Paul
8c2f6c5059 added GL_IBM_rasterpos_clip extension 2001-06-26 01:32:48 +00:00
Brian Paul
657323bf03 added missing GLX_PBUFFER_WIDTH/HEIGHT tokens 2001-06-25 15:29:11 +00:00
Jouk Jansen
5e7591f94c Modified Files:
Mesa/src/descrip.mms

 Removed obsolete .obj files.

----------------------------------------------------------------------
2001-06-21 12:19:43 +00:00
Brian Paul
9e5e5e35a0 bumped version numbers 2001-06-20 19:52:11 +00:00
Brian Paul
4d99e5b2e7 also print GL_MAX_TEXTURE_SIZE 2001-06-20 19:12:30 +00:00
Brian Paul
f6df34ecbe updates for the 3.5 release 2001-06-20 19:02:48 +00:00
Brian Paul
d491f7bc14 removed beta from version string 2001-06-20 18:54:43 +00:00
Brian Paul
1fb583c50d added a few missing si-glu files 2001-06-19 21:49:06 +00:00
Brian Paul
6738d2ac78 add m4/ directory to tar file list 2001-06-19 19:51:23 +00:00
Brian Paul
293b786cee more updates to tar file lists for 3.5 2001-06-19 18:06:41 +00:00
Brian Paul
af197f5f8f fix glDraw/CopyPixels w/ fog bug. minor fog code clean-ups. 2001-06-18 23:55:18 +00:00
Brian Paul
aba535e765 tar file list updates for 3.5 2001-06-18 23:39:38 +00:00
Brian Paul
76f8274daf replaced -g with -O3 under linux-x86 2001-06-18 22:45:16 +00:00
Brian Paul
1b25898946 Consolidated source files. Since the re-org a number of source files
only had one or two functions left in them.
2001-06-18 17:26:08 +00:00
Brian Paul
24ae7c4c1f Added fi_type union typedef to glheader.h.
Replace various float/int casts with the fi_type union cast.
Fixes -fstrict-aliasing problems.
2001-06-15 15:22:07 +00:00
Brian Paul
e4276667da Enable GL_ARB_texture_compression for XMesa/GLX driver. Texture
compression isn't really implmented.  Just updated glTexImageXD()
to accept compressed internal format tokens.
2001-06-15 14:18:46 +00:00
Brian Paul
65c6ca9179 replace 255 with CHAN_MAX 2001-06-15 13:41:12 +00:00
Brian Paul
03d6c4c2db define both GL_ALL_CLIENT_ATTRIB_BITS and GL_CLIENT_ALL_ATTRIB_BITS (spec and SI don't agree) 2001-06-14 21:37:43 +00:00
Brian Paul
2db44ffe9d fixed a comment 2001-06-14 18:30:14 +00:00
Brian Paul
e9ba8e9214 disabled an assertion that doesn't seem to be needed 2001-06-13 14:57:55 +00:00
Brian Paul
cd1cefae91 Allow different max texture sizes for 1/2D, 3D and cube maps. 2001-06-13 14:56:14 +00:00
Brian Paul
cc22179cd8 fixed an assertion 2001-06-13 14:55:25 +00:00
Brian Paul
1178ed817f fixed a +/- typo in the Y coord setup 2001-06-13 14:53:52 +00:00
Brian Paul
688601911c moved glTexEnvi calls to better logical locations 2001-06-13 14:33:16 +00:00
Brian Paul
ae47121fa3 removed old, redundant CurrentTransformUnit state var 2001-06-12 22:08:41 +00:00
Brian Paul
1676268eab always feedback unit 0 texcoords 2001-06-12 22:06:53 +00:00
Brian Paul
baace9ffca don't compile glClientActiveTextureARB() into display lists, per the spec 2001-06-12 22:06:10 +00:00
Brian Paul
5ed63e0895 disable pixel transfer ops for glGetTexImage(), per the spec 2001-06-12 22:05:34 +00:00
Brian Paul
d3778fc129 added latest line and triangle bug fixes 2001-06-12 14:32:15 +00:00
Brian Paul
a2162e4228 Snap triangle x,y vertices to 1/16 subpixel positions.
Disabled tiny triangle threshold test.
2001-06-12 14:18:58 +00:00
Brian Paul
57b46ee6ea check for PB overflow in general_flat_rgba_line() 2001-06-11 19:44:01 +00:00
Brian Paul
e67d632d99 fixed minor display list bugs (#431517) 2001-06-11 19:17:11 +00:00
Jouk Jansen
5891a5dd55 Committing in .
Modified Files:
 	Mesa/src/macros.h

 Added
  #define COPY_4UBV()
 for non i386 machines
----------------------------------------------------------------------
2001-06-11 07:52:51 +00:00
Brian Paul
0ce9f39d23 add check for NULL malloc (from Stanford metacompilation analysis) 2001-06-08 20:10:55 +00:00
Brian Paul
5fd13173a1 added COPY_4UBV bug fix 2001-06-08 15:47:48 +00:00
Brian Paul
fabc30cfdd only copy GLubyte[4] as a GLuint on x86 2001-06-08 15:46:30 +00:00
Brian Paul
36822c50ad use unoptimized COPY_4UBV code on SPARC to avoid memory alignment problems (bug 430689) 2001-06-08 12:49:38 +00:00
davem69
4a497e649b Remove dependency on MESA sources from gl* files
in SPARC glapi optimizations by moving the icache
flush into the glapi_sparc.S file.

Brian, how is this?
2001-06-06 22:55:28 +00:00
Brian Paul
a5455bb374 test for X86_FXSR_MAGIC to be sure we have the _fpstate.magic field, needed for SSE signal handler 2001-06-06 18:12:35 +00:00
davem69
6f365c21d7 SPARC normal tnl optimizations. 2001-06-06 11:46:04 +00:00
davem69
775355a88a Sparc optimized GLAPI dispatch table. 2001-06-05 23:54:00 +00:00
davem69
0fab0702b0 Generate this now that I know which
gl.spec file to use.
2001-06-05 22:25:07 +00:00
Brian Paul
470a7b4874 minor clean-ups 2001-06-05 21:41:05 +00:00
Brian Paul
a1164746e7 filled in a bunch of the function template strings 2001-06-05 19:29:41 +00:00
davem69
ae14499101 Python script for making glapi_sparc.S
Unused until Brian shows me what gl.spec file he is
actually using for glapi_x86.S as all the ones I can
find seem out of sync.
2001-06-05 04:30:03 +00:00
davem69
e4f84b4936 Add USE_SPARC_ASM diagnostics to print_info. 2001-06-05 03:58:20 +00:00
Brian Paul
b20cea3902 removed some code in XMesaDestroyContext() which could lead to a segfault 2001-06-04 22:33:02 +00:00
Keith Whitwell
51b36396ae Adaptor code that lets tnl convert compiled (display list) cassettes back
to glVertex() type calls.  Allows driver-supplied tnl modules to avoid
fallback on glCallList inside begin/end pairs.

Still a little buggy...
2001-06-04 16:09:28 +00:00
Keith Whitwell
abd5134965 fixed some GL_POINTS probs 2001-06-04 15:34:31 +00:00
Keith Whitwell
bd58a63fe8 New files to provide glEvalPoint, glEvalCoord implementations for
driver tnl modules.
2001-06-04 13:57:35 +00:00
Keith Whitwell
2c2a956a3a Add api_arrayelt.c 2001-06-01 22:22:41 +00:00
Keith Whitwell
4b7d6f216b Working implementation of glArrayElt that decomposes to regular
glVertex/glNormal/etc calls.
2001-06-01 22:22:10 +00:00
Brian Paul
a7de8b6776 added minor comments 2001-06-01 16:29:18 +00:00
Brian Paul
8a039ffe0a applied Klaus Niederkrueger's CHAN_BITS==32 patch 2001-06-01 13:23:27 +00:00
Keith Whitwell
741c2e6434 apply David Miller's quad/backcolor patch 2001-06-01 12:07:15 +00:00
Brian Paul
4097590bc6 replaced #ifdef 0 with #if 0 2001-05-31 23:06:01 +00:00
Brian Paul
21f80baa35 swapped in/out arguments to interp_func. Improved comments 2001-05-31 23:03:05 +00:00
Brian Paul
e715c4a62d fixed s/w alpha channel bug 2001-05-31 19:25:25 +00:00
Brian Paul
987caacbeb GLubyte -> GLchan fix 2001-05-30 17:44:14 +00:00
Brian Paul
b5d3f2c521 added current raster fog coord and related code 2001-05-30 15:22:04 +00:00
Brian Paul
529e48bb0f added test for EXT_fog_coord 2001-05-30 14:43:17 +00:00
Brian Paul
47a3c67fa6 forgot to check-in yesterday 2001-05-30 14:39:47 +00:00
Keith Whitwell
71f2c401c5 rerun vertex stage on _MESA_NEW_NEED_EYE_COORDS 2001-05-30 10:01:41 +00:00
Brian Paul
84cac8441f more DRI libGL-related changes 2001-05-29 23:15:07 +00:00
Brian Paul
e4a01fd7e1 added math/m_debug_clip.c 2001-05-29 22:06:13 +00:00
Brian Paul
655ba5d992 removed some old DRI-isms 2001-05-29 19:48:46 +00:00
Brian Paul
ffa10b1c3b added new functions to GLX_functions[] 2001-05-29 16:23:26 +00:00
Brian Paul
645c1cef13 s/void */GLvoid */ 2001-05-29 15:44:06 +00:00
Brian Paul
736fcbec47 infrastructure for GL_ARB_multisample 2001-05-29 15:23:48 +00:00
Brian Paul
5ff1c613ea removed unused var 2001-05-29 15:23:15 +00:00
Brian Paul
b0bb4f6226 more work on XMesa / libGL integration 2001-05-25 21:51:02 +00:00
Brian Paul
b95884c53d added void to __GLXextFuncPtr 2001-05-25 15:44:06 +00:00
Brian Paul
2a3cc7d907 added missing GLX_SGIS_multisample tokens 2001-05-25 15:41:29 +00:00
Brian Paul
c98da4d99a changed #if OLD_VMS to #ifdef OLD_VMS 2001-05-25 15:40:29 +00:00
Brian Paul
12c1bee87f added some casts so that older glx.h can be used 2001-05-24 20:05:32 +00:00
Brian Paul
e203c9cdd8 change GLXContext and GLXFBConfig typedefs 2001-05-24 19:07:14 +00:00
Brian Paul
7cf50e137d Initial changes to allow Mesa and its fake GLX to be built into XFree86 libGL. 2001-05-24 19:06:21 +00:00
Brian Paul
bcebfe647f added GL_SGIS_generate_mipmap 2001-05-24 14:49:14 +00:00
Brian Paul
9228e17bb5 Finished GL_SGIS_generate_mipmap. Should be trivial to enable in DRI drivers. 2001-05-24 14:47:56 +00:00
Brian Paul
55ed11bac5 prototyping some new stuff 2001-05-24 00:00:57 +00:00
Brian Paul
874ae72495 added color table clamp bugfix 2001-05-23 23:55:52 +00:00
Brian Paul
f6e0e92beb fix bug 426657: need to clamp RGBA before color table lookups 2001-05-23 23:55:01 +00:00
Brian Paul
6f0ab1d868 import from 3.4 branch 2001-05-23 14:45:01 +00:00
Brian Paul
e34d63f087 added 3.4.2 changes, SPARC assembly 2001-05-23 14:44:12 +00:00
Brian Paul
04a6c35819 updated copyright 2001-05-23 14:42:47 +00:00
Brian Paul
7943b349d6 SPARC assembly optimizations from David Miller. 2001-05-23 14:27:03 +00:00
Brian Paul
8bd0693101 a little more work on GL_SGIS_generate_mipmap 2001-05-22 21:49:03 +00:00
Brian Paul
6b1e4ea5a5 fixed a number of multi-texture line bugs 2001-05-21 18:13:43 +00:00
Brian Paul
300e1056f5 added multitexture support 2001-05-21 17:45:25 +00:00
Brian Paul
3893e638e6 initial support for GL_SGIS_generate_mipmap extension 2001-05-21 16:41:03 +00:00
Gareth Hughes
e7e38a47a8 Initial commit of cliptest work. More to come shortly.
- Add debug, benchmark code.
 - Change linux/x86 FAST_MATH code to GCC/x86, and clear FP exceptions
   before exiting the fast math block.
 - Remove divide-by-zero test in x86 cliptest, and set clipped vertices
   to [0,0,0,1] instead of leaving them uninitialized.
2001-05-21 16:33:41 +00:00
Brian Paul
e9482d004f s/Height/height/ (Jeff Potter) 2001-05-21 14:46:33 +00:00
Brian Paul
d577248b89 added missing #undefs at end of file 2001-05-18 23:58:26 +00:00
Brian Paul
ca78774fc7 fixed a bad error string in ClientActiveTexture() 2001-05-18 22:10:49 +00:00
Brian Paul
569b5f32b9 fixed two GL error calls 2001-05-17 21:33:14 +00:00
Brian Paul
758a21f104 fixed Width/Height typo (Jeff Hartmann) 2001-05-17 20:18:45 +00:00
Brian Paul
1341f40dfe removed (void) index; statement 2001-05-17 14:49:38 +00:00
Keith Whitwell
5439ab0683 Comment out __FUNCTION__ usage. 2001-05-17 11:33:33 +00:00
Keith Whitwell
89dae684aa Fix order of decomposition of quad.
Remove 'swrast->_MultiTexEnabled' derived value.
2001-05-17 09:32:17 +00:00
Brian Paul
47cf442c11 use DEFARRAY, etc macros to work around 32k data limit on Macs (Tom Goon) 2001-05-16 20:27:12 +00:00
Brian Paul
441a4af435 generate INVALID_OPERATION if active texture != 0 in glMap[12][fd] 2001-05-16 17:06:28 +00:00
Keith Whitwell
dbd0dad580 fix for Jouk's glplanet bug 2001-05-16 09:28:32 +00:00
Brian Paul
c47a5327d3 added latest 3.5 changes 2001-05-15 21:31:36 +00:00
Brian Paul
5071b0812f Apply antialiasing coverage factor to alpha after texture application,
not before.
2001-05-15 21:30:26 +00:00
Brian Paul
a51f07d5a1 _mesa_pack_index_span() was broken for non-GLubyte datatypes 2001-05-15 21:21:08 +00:00
Brian Paul
9e48553ccc increase FOG_MAX to 10.0 to fix CI conformace failure 2001-05-15 20:52:51 +00:00
Brian Paul
80532da3bf minor clean-ups and more comments 2001-05-15 16:18:13 +00:00
Brian Paul
d57bcbed46 moved some misplaced compiler flags from CC assigment to CFLAGS 2001-05-15 15:27:43 +00:00
Brian Paul
0ab16e0134 New IFLOOR, ICEIL macros from Josh Vanderhoof. Fixes problems with
IFLOOR(1.99999)==2, for example.  Moved some macros from config.h to glheader.h
2001-05-14 23:11:12 +00:00
Keith Whitwell
649971518c typo 2001-05-14 16:34:24 +00:00
Brian Paul
f89035b8c4 changed MAX_HEIGHT to 2048 2001-05-14 16:25:18 +00:00
Brian Paul
9bf68ad963 New triangle rasterization code. Store per-span initial/step values in the
new triangle_span struct.  Much cleaner code and possibilities for future
optimizations.
2001-05-14 16:23:04 +00:00
Keith Whitwell
9cf779e7ac Fix for glean texgen test. 2001-05-14 09:00:51 +00:00
Keith Whitwell
b8d091d350 increase blocksize, remove dead opcodes 2001-05-14 08:57:36 +00:00
Gareth Hughes
53e4ebd4e3 Fix long-standing FP exception bug in _mesa_x86_cliptest_points4(). 2001-05-13 18:55:15 +00:00
Brian Paul
d29e9dfe93 fixed scissor clear problem (Michael Saunders) 2001-05-11 18:58:32 +00:00
Keith Whitwell
c6083e1dc4 Clean up _tnl_Begin/begin/hard_begin.
Fix some problems with draw_arrays, draw_elements.
2001-05-11 15:53:06 +00:00
Keith Whitwell
b8f9980999 fix a couple of small bugs 2001-05-11 15:47:02 +00:00
Keith Whitwell
5759f53934 made render path selection more flexible 2001-05-11 12:08:15 +00:00
Keith Whitwell
6d1055c967 Clean up translation of array elements, copying of elts in pure-elt
cassettes.  Fixes problem with isosurf/compiled-array-elt/strips.
2001-05-11 08:11:31 +00:00
Brian Paul
1a3e034b12 redo previous change in a more defensive way 2001-05-10 18:01:19 +00:00
Brian Paul
a5cc6155d4 added check for zero-length spans, avoids potential problems later 2001-05-10 17:55:54 +00:00
Brian Paul
dbed202744 fixed some divide by zero problems found w/ conform 2001-05-10 17:41:41 +00:00
Brian Paul
bd3d9b9d04 RGBA mode GL_NAND was wrong, fixed 16-bit GLchan support 2001-05-10 16:54:12 +00:00
Keith Whitwell
8b6a91a93f Set 'prefer_float_colors' true, now that tnl uses them natively.
Apply Jeff Epler's optimization to ci spans as well, remove old code.
2001-05-10 15:42:42 +00:00
Brian Paul
e296d7f0e4 applied Jeff & Keith's optimization to write_span_mono_pixmap() 2001-05-10 14:21:17 +00:00
Brian Paul
ad51be1ad4 fixed bad texture border test (sometimes caused a segfault) 2001-05-10 12:57:12 +00:00
Brian Paul
72deb502d7 minor clean-up 2001-05-10 12:33:28 +00:00
Keith Whitwell
bc69de5f21 Driver interface changes 2001-05-10 12:22:32 +00:00
Keith Whitwell
7954a0cafd Replace PipelineStart, PipelineFinish with RunPipeline. Clean up
_tnl_run_pipeline() a little.
2001-05-10 12:18:38 +00:00
Brian Paul
f2bcadec7c removed linux-386-opt-V2-glide config since FX_V2 symbol has no significance anymore 2001-05-10 03:00:58 +00:00
Brian Paul
f50bbbf855 check hardware type and use SETUP_SNAP if needed 2001-05-10 02:59:04 +00:00
Brian Paul
8acb7e9ea2 fixed loop bug in _mesa_ConvolutionFilter2D() 2001-05-09 22:24:22 +00:00
Brian Paul
20dc7e6945 minor clean-ups 2001-05-09 21:58:19 +00:00
Brian Paul
b9f2494bfc fixed FP underflow problem in kfact computation 2001-05-09 21:36:52 +00:00
Brian Paul
91979127ec fixed font/bitmap x-offset bug (Frank Warmerdam) 2001-05-09 20:45:00 +00:00
Brian Paul
7884aa151f fixed Y flip problem in read_rgba_pixels() (Frank Warmerdam) 2001-05-09 20:42:37 +00:00
Brian Paul
a41edc31ce check for tiny values in dir[] vector in calcposobjs(), prevents FP underflows later 2001-05-09 20:02:28 +00:00
Brian Paul
61cb081a35 missed a GLfixed->GLfloat fog change 2001-05-09 17:31:46 +00:00
Brian Paul
78023e9808 don't call _mesa_win_fog_coords_from_z() if fog is disabled, fixes FP exception 2001-05-09 17:21:51 +00:00
Brian Paul
7b9ff48d02 make sure rotation plugged into sin/cos lookup tables is always positive, fixes FP exception 2001-05-09 17:14:19 +00:00
Brian Paul
f2bfc66c5d fixed minor logic error in _mesa_StencilOp() 2001-05-09 16:34:09 +00:00
Keith Whitwell
cd487af90b remove debug code 2001-05-09 15:34:08 +00:00
Keith Whitwell
5f2230c7bf add missing translate functions 2001-05-09 14:12:34 +00:00
Keith Whitwell
bcf749e83a fix possible segfault on destroy context 2001-05-09 13:53:36 +00:00
Keith Whitwell
335634b807 Add FLUSH_CURRENT() calls to fix ordering problems (incl. hierarchical
dlist calls).
2001-05-09 12:48:21 +00:00
Keith Whitwell
e809379caf Use correct PV when clipping. 2001-05-09 12:25:40 +00:00
Keith Whitwell
0a716cdff8 Don't scale basealpha by 255 now it's a float. 2001-05-09 12:24:51 +00:00
Keith Whitwell
0ff31445f2 fix eval/colormaterial interaction 2001-05-09 11:06:30 +00:00
Brian Paul
bc920f08f5 set MRD to 1.0, fixes new Glean polygon offset failure 2001-05-07 16:32:51 +00:00
Brian Paul
dae62174c5 sample plane equations at fragment centers, not lower-left corner 2001-05-07 16:01:59 +00:00
Gareth Hughes
c5e907e501 Add new tests. 2001-05-07 14:16:19 +00:00
Gareth Hughes
95d0fe9c11 More cleanups. 2001-05-07 14:06:15 +00:00
Gareth Hughes
c329f0824c Initial new Win32 build support. More to come. 2001-05-07 13:58:00 +00:00
Brian Paul
43caa5c09a added info about driver status in 3.5 2001-05-04 17:42:53 +00:00
Brian Paul
a2519c8aed do FLUSH_VERTICES() in glGet*() functions to make occlusion testing work, perhaps needed for other cases, like GL_CURRENT_COLOR 2001-05-03 23:55:38 +00:00
Brian Paul
1b3528fe63 interpolate fog valus as floats, not fixed - fixed the swrast fog problem 2001-05-03 22:13:32 +00:00
Keith Whitwell
652a14a215 fix for moebius infinite loop 2001-05-03 16:49:27 +00:00
Brian Paul
a03463303d added assertion to catch infinite loop in _tnl_fixup_compiled_cassette() - might help Keith 2001-05-03 16:11:16 +00:00
Brian Paul
9e351d52ae minor clean-ups and warning fixes 2001-05-03 14:11:18 +00:00
Keith Whitwell
5028216c81 add disabled test to turn on vertex snapping. 2001-05-03 09:11:03 +00:00
Brian Paul
531ac77263 fixed vertex color problems 2001-05-02 23:08:35 +00:00
Brian Paul
fe5cb830b1 teximage updates. seems to work fine. 2001-05-02 21:04:08 +00:00
Brian Paul
104c9fde4e changed parameters to _mesa_rescale_teximage2d() 2001-05-02 21:02:38 +00:00
Brian Paul
70bb907286 minor XFree86 change 2001-05-01 22:01:11 +00:00
Keith Whitwell
adcc2ce92b float color changes 2001-05-01 19:17:15 +00:00
Brian Paul
7448e33768 applied Diego Santa Cruz's patch to triangulateRectCenter() 2001-05-01 14:56:00 +00:00
Keith Whitwell
5b976943ee removed debug 2001-05-01 13:15:28 +00:00
Keith Whitwell
f4a003c3ca fix from Jouk 2001-05-01 07:25:41 +00:00
Keith Whitwell
0e14d6d68e Lots more eval fixes 2001-04-30 21:08:51 +00:00
Keith Whitwell
16837e4219 Restore optimization for cva glArrayElement operation. 2001-04-30 09:04:00 +00:00
Brian Paul
ac4a41d198 sync with XFree86/DRI glcore.h, now identical 2001-04-29 19:31:45 +00:00
Keith Whitwell
3d49061bfc typo 2001-04-29 08:48:43 +00:00
Keith Whitwell
d92f615fe5 More HW_DIVIDE checks. 2001-04-29 08:44:30 +00:00
Keith Whitwell
1018a16f39 Allow drivers to provide a dynamic CHECK_HW_DIVIDE, to turn the divide off
according to a runtime test.
2001-04-29 08:41:09 +00:00
Keith Whitwell
f358988f2e fix color copying in twosided quads 2001-04-28 15:47:48 +00:00
Keith Whitwell
04a374bd05 add specialized interp for backcolor, edgeflags 2001-04-28 15:26:43 +00:00
Keith Whitwell
51c0c71811 Support for floating point color representation in tnl module. 2001-04-28 08:39:17 +00:00
Brian Paul
27b0758a94 added -display option 2001-04-27 21:19:13 +00:00
Brian Paul
1832f1cc86 changed xmesa_visual and xmesa_buffer structs to directly include GLvisual and GLframebuffer structs instead of pointers 2001-04-27 21:18:25 +00:00
Brian Paul
75978bd85e added _mesa_free_framebuffer_data() 2001-04-27 21:17:20 +00:00
Brian Paul
4dbd625eaf added 16-bit/channel rendering info 2001-04-26 22:33:34 +00:00
Brian Paul
785c3469f4 Added Makefile support for building libOSMesa16.so which is Mesa compiled
for 16-bit color channels, using the OSMesa driver.
2001-04-26 22:27:09 +00:00
Brian Paul
f20ea88f88 fixed mem leak in XFreeFontInfo() call 2001-04-26 19:28:02 +00:00
Brian Paul
11785d441d flush pipeline in WMesaSwapBuffers (Frank Warmerdam) 2001-04-26 19:14:35 +00:00
Keith Whitwell
908be619fd first pass at eval fixes 2001-04-26 14:53:48 +00:00
Keith Whitwell
8bce6a217a no-copy drawarrays for remaining non-fan primitives 2001-04-26 14:51:06 +00:00
Brian Paul
5a2f32b102 fixed a potential tex obj reference count problem involving multi-texture 2001-04-25 18:21:05 +00:00
Brian Paul
830bf65275 added -Wundef to linux-debug compiler flags 2001-04-25 15:52:15 +00:00
Brian Paul
73ccfa0e9a added ShowAlphaBuffer feature - 'a' key 2001-04-25 15:51:32 +00:00
Brian Paul
3bfd0e6f9f minor simplification in glGetTexLevelParameter 2001-04-25 15:41:22 +00:00
Brian Paul
31acab88f2 fixed typo in GL_ARB_transpose_matrix 2001-04-24 21:52:36 +00:00
Brian Paul
08b3ff10d3 added -i and -h options 2001-04-24 20:57:36 +00:00
Brian Paul
df4fd765d5 reordered a few blend enums 2001-04-24 16:12:48 +00:00
Brian Paul
8753bd8900 fixed problems with texel component size queries in glGetTexLevelParameter() 2001-04-24 16:11:35 +00:00
Brian Paul
691f58930b texture image code updates (not finished) 2001-04-24 03:02:23 +00:00
Brian Paul
29acfe5bd4 assign texImage->FetchTexel only if NULL 2001-04-24 03:00:17 +00:00
Brian Paul
ad608fe44d fixed two mistakes in texture combine code 2001-04-23 18:06:09 +00:00
Brian Paul
cb6ae7b16b compilation fixes - texturing isn't working at this time 2001-04-20 22:51:55 +00:00
Brian Paul
b570a180da Minor fixes for Win32 (Karl Schultz). 2001-04-20 19:21:41 +00:00
Brian Paul
0a31a67269 improved a glBindTexture error message 2001-04-20 17:16:52 +00:00
Brian Paul
1c85aa3332 Fixed a texture conversion problem: sometimes need to produce an intermediate
texture image in the base internal format between user->Mesa format
conversion.  See comments in texstore.c
2001-04-20 16:46:04 +00:00
Brian Paul
3518a7950f check-in of old updates 2001-04-20 02:34:12 +00:00
Brian Paul
e3a7cc1f9e removed glext.h hacks 2001-04-19 22:40:45 +00:00
Brian Paul
5ff4075a69 bug fixes, added missing state query cases 2001-04-19 22:39:50 +00:00
Brian Paul
4c00e30ef0 added GL_ARB_texture_env_combine GL_ARB_texture_env_dot3 GL_ARB_texture_border_clamp (temporary until SGI updates this file) 2001-04-19 22:34:05 +00:00
Brian Paul
54207dfde6 added SecondaryColor functions 2001-04-19 22:33:03 +00:00
Keith Whitwell
18acf6e6f1 Add more options, including '-10','-100' and '-1000' to limit nr of vertices. 2001-04-19 13:12:40 +00:00
Keith Whitwell
3004bf8fd7 Remove values from VB->importable_data as those arrays are removed
from the VB.
2001-04-19 12:23:07 +00:00
Keith Whitwell
2b7c042525 Fix striding of color material inputs. (Fixes glean colorLitPerf) 2001-04-19 12:22:09 +00:00
Brian Paul
72fc93302c minor optimization to dot3 computation 2001-04-17 22:08:28 +00:00
Brian Paul
bcfe3936a8 Fixed a number of minor GL_ARB_texture_env_combine/dot3 issues. 2001-04-17 21:25:53 +00:00
Brian Paul
15eddf38fb another fix in import_texcoord() 2001-04-17 21:08:32 +00:00
Brian Paul
a6c6fce7e8 replaced ac->count with ac->count - ac->start in import_texcoord(), as in the other import functions 2001-04-17 20:37:44 +00:00
Brian Paul
0d47d26a68 fixed mis-ordered args to _math_trans_4f() in _tnl_fill_immediate_drawarrays() 2001-04-17 17:01:33 +00:00
Brian Paul
62c24f315b return hex string for unknown tokens in _mesa_lookup_enum_by_nr() 2001-04-16 21:07:33 +00:00
Brian Paul
a2ade36eb1 added missing 'break' in _mesa_TexEnvfv(), better error messages 2001-04-16 21:06:54 +00:00
Brian Paul
bf478280eb added a work-around in _swrast_copy_texsubimage[123]d() to fix alpha channel problem in some DRI drivers (see comments) 2001-04-13 00:13:51 +00:00
Brian Paul
77ff5e038a b-key toggles between textures w/ and w/out border 2001-04-12 20:50:26 +00:00
Brian Paul
608889d18f Moved FRAC macro out of mmath.h into s_texture.c since it's only used there
and doesn't do what one might expect for negative values.
Reimplemented FRAC in terms of floor() to fix glitches seen in tests/texwrap.c.
Minor fix for problem with GL_CLAMP_TO_BORDER_ARB with GL_NEAREST sampling.
2001-04-12 15:18:07 +00:00
Brian Paul
93de8d3d86 Reimplemented glPopAttrib code for GL_TEXTURE_BIT. It now calls the
various texture API functions to restore state.  Before, the device
drivers weren't getting notified of important texture state changes.
2001-04-11 23:22:20 +00:00
Brian Paul
6ac852d45b fixed some divide by zero conformance problems 2001-04-10 15:46:51 +00:00
Brian Paul
33143303fe Added IROUND_POS() macro to mmath.h and use where appropriate. (Klaus Niederkrueger) 2001-04-10 15:25:45 +00:00
Alan Hourihane
148bd34079 remove a HAVE_ELTS that I'd stuck before. 2001-04-09 15:41:11 +00:00
Keith Whitwell
8a09c3a34b Perform fixup on material values 2001-04-09 14:47:34 +00:00
Alan Hourihane
c818d6cce5 fix use of projected vertices with notex vertices when DO_PTEX isn't set. 2001-04-09 10:16:01 +00:00
Alan Hourihane
30c75badd1 Add quad and quad_strip 2001-04-07 16:16:58 +00:00
Alan Hourihane
d3abe14a3a add FINISH function at end of each render_* function
fix typo.
2001-04-06 16:26:41 +00:00
Brian Paul
2aacac9a5d replaced IntFormat GL_BGRA with GL_RGBA, fixes problems calling _mesa_base_texture_format() 2001-04-04 23:56:33 +00:00
Brian Paul
01429fa46a GL_INTENSITY case was incorrect in extract_float_rgba() 2001-04-04 23:22:38 +00:00
Brian Paul
36f3712e85 fixed tmpTexelSize computation bug 2001-04-04 22:41:23 +00:00
Brian Paul
7d58f44f73 More texture image changes.
1. Added ctx->Driver.ChooseTextureFormat() function.  Examines user's
   internalFormat, format, type params and returns a gl_texture_format.
2. _mesa_store_teximage[123]d() calls ctx->Driver.ChooseTextureFormat(),
   allocates storage and transfers the image into the desired format.
3. _mesa_transfer_teximage() now takes a gl_texture_format to describe
   the destination format.  Any combination of input format/type and
   output gl_texture_format is accepted.  Uses optimized _mesa_convert_-
   texsubimage[123]d() functions when possible.
3. DRI driver's TexImage[123]D functions should be a lot simpler now.
2001-04-04 21:54:20 +00:00
Brian Paul
bb0830da9e Updated bug report info in _mesa_problem() 2001-04-04 13:38:51 +00:00
Jouk Jansen
bb95cf8934 Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Removed glapinoop

----------------------------------------------------------------------
2001-04-04 12:02:12 +00:00
Brian Paul
bc80faa7d9 another fix to clear_32bit_ximage() 2001-04-03 17:35:54 +00:00
Brian Paul
a9e2abdcfb include fxdrv.h before other headers (Ivan Kalvatchev) 2001-04-03 16:32:29 +00:00
Brian Paul
2e1ed6447a fixed wglUseFontBitmapsA() bugs (Frank Warmerdam) 2001-04-03 16:25:54 +00:00
Brian Paul
9d205e3542 clear pixel value wasn't byteswapped for scissored clears in clear_32bit_ximage() 2001-04-03 16:19:54 +00:00
Brian Paul
373aea11c8 applied David's patch for parsing display's server:screen string 2001-04-02 22:45:07 +00:00
Brian Paul
67f7554232 querying proxy texture image info was segfaulting because of NULL TexFormat pointer 2001-03-30 21:14:30 +00:00
Brian Paul
347b3f0daf add texture border width to x/y/zoffset in gl[Copy]TexSubImage*D() functions to accomodate negative offsets correctly 2001-03-30 21:12:15 +00:00
Brian Paul
e116d3b3e5 texImage->FetchTexel wasn't getting initialized in _mesa_CopyTexImage1/2D() 2001-03-30 15:31:44 +00:00
Brian Paul
7b0b2ec73a fixed compilation problems related to ctx->_Enabled removal 2001-03-30 15:16:12 +00:00
Gareth Hughes
5e23af22f7 Remove all traces of CULL_MASK_ACTIVE. 2001-03-30 14:44:43 +00:00
Keith Whitwell
afc5699b08 Fix calculation of fog coordinate in translate_vertex(). 2001-03-30 00:39:02 +00:00
Keith Whitwell
ed39a43b8c Remove ENABLE_* flags, ctx->_Enabled.
Replace with ctx->Texture._TexMatEnabled, ctx->Texture._TexGenEnabled.
2001-03-29 21:16:25 +00:00
Brian Paul
2780ed4b97 silence a compiler warning 2001-03-29 17:15:21 +00:00
Keith Whitwell
3d5815f463 Removed DD_STENCIL, DD_FEEDBACK, DD_SELECT.
Added some switchable debug to s_context.c
2001-03-29 17:08:26 +00:00
Brian Paul
ee403ff0ba Removed DD_Z_NEVER.
Replaced SEPERATE with SEPARATE.
Renumbered _NEW_ flags.
Removed _NEW_COLORTABLE.
2001-03-29 16:50:31 +00:00
Gareth Hughes
1b2fef5c28 Consolidation of asm code in 3.5 2001-03-29 06:46:15 +00:00
Gareth Hughes
8e48a232fe Make generation of matypes.h more transparent. 2001-03-29 03:41:39 +00:00
Gareth Hughes
c41edfb7c4 Add missing GEN_SOURCES definitions. 2001-03-29 03:14:48 +00:00
Brian Paul
3d9168025c compilation updates 2001-03-28 21:39:49 +00:00
Brian Paul
f1f288182e adjustment to coverage sample positions 2001-03-28 21:37:24 +00:00
Gareth Hughes
16a8e986ce - Restore texImage->IntFormat.
- Fix FX driver texture image conversions.
2001-03-28 21:36:31 +00:00
Brian Paul
d082417dae check for startX off the right edge of the window 2001-03-28 21:36:31 +00:00
Brian Paul
5bfaa2f12e use Image[i]->TexFormat to check for mipmap consistency 2001-03-28 21:31:54 +00:00
Brian Paul
38e3675d7d simplify test for specific texture formats 2001-03-28 21:31:24 +00:00
Gareth Hughes
0a59ca6cae New type system for assembly code. Asm files should now include
matypes.h, which includes assyntax.h and is generated from the core Mesa
header files.
2001-03-28 20:44:43 +00:00
Gareth Hughes
38f28665bf More texture format updates. Drivers now need only plug an appropriate
format into texImage->TexFormat, the rest is handled by core Mesa.
2001-03-28 20:40:51 +00:00
Gareth Hughes
53933fe9db More informative display of texture parameters. 2001-03-28 20:25:14 +00:00
Gareth Hughes
29cded2654 Delete libGLU.so* from ../lib before installing it. 2001-03-28 20:17:55 +00:00
Brian Paul
c7aeb8bf1f removed a debug message 2001-03-28 17:39:12 +00:00
Brian Paul
46560b94ae remove TEST_L and JZ instructions; always jump through the _glapi_Dispatch pointer 2001-03-28 17:22:11 +00:00
Brian Paul
3c257e187b New mechanism for thread-safe GL API dispatch. C-based dispatch is faster.
Folded glapinoop.c code into glapi.c.
Added code to glapitemp.h to fill in dispatch tables.
Updated Makefiles.
2001-03-28 17:19:58 +00:00
Brian Paul
fb8af6fc97 pass dst and src to CONVERT_TEXEL() macros to fix non-ANSI problems 2001-03-27 20:32:24 +00:00
Brian Paul
81e3955acf fixed RGBA/RGB typo 2001-03-27 20:26:37 +00:00
Brian Paul
197c526d63 texFormat was a random value in _mesa_store_teximage3d(), fix by undoing last changes 2001-03-27 20:26:10 +00:00
Gareth Hughes
19d1e43261 Updates required for DRI drivers on mesa-3-5-branch. 2001-03-27 19:18:02 +00:00
Brian Paul
a767bff929 added rules for readtex.c and readtex.h 2001-03-27 17:44:35 +00:00
Brian Paul
5479e93031 double buffer by default. if drawSmooth, use 50% alpha at top of polygon 2001-03-27 17:38:28 +00:00
Brian Paul
8afa9e593b set initial window pos 2001-03-27 17:35:26 +00:00
Brian Paul
0a355dc010 clean-up of tunnel demos 2001-03-27 17:30:51 +00:00
Brian Paul
25a5dc2ea7 moved shadow code into teapot.c 2001-03-27 17:08:20 +00:00
Brian Paul
06ed3f0a0a silence compiler warnings 2001-03-27 16:42:37 +00:00
Brian Paul
6dbb39025c removed DO_GEOMETRY 2001-03-26 23:36:51 +00:00
Brian Paul
5535aca5df change glTexImage3D() internalFormat to GLenum to match other OpenGLs 2001-03-26 20:02:38 +00:00
Brian Paul
0bc933a460 test texture wrap modes 2001-03-26 19:45:57 +00:00
Brian Paul
2bb04cad14 added GL_ARB_texture_border_clamp 2001-03-26 19:42:40 +00:00
Gareth Hughes
425fea1c34 - Minor cleanups of ctx->Driver.Current*Primitive usage.
- Remove unused gl_reduce_prim array.
2001-03-24 06:01:27 +00:00
Gareth Hughes
577f318e0e Fix ASSERT_OUTSIDE_SAVE_BEGIN_END() macro as well. 2001-03-24 05:23:46 +00:00
Brian Paul
63fae71713 added glxgears 2001-03-23 22:48:35 +00:00
Brian Paul
355da23785 gears using GLX instead of GLUT 2001-03-23 22:46:26 +00:00
Brian Paul
39557c3921 added silly mesa_hack() function and -b option 2001-03-23 21:41:44 +00:00
Brian Paul
6d62d7f321 minor tweak to visual setup for accum buffers 2001-03-23 21:37:05 +00:00
Brian Paul
4672b2d88c fixed Min/Max lod clamp bug 2001-03-23 18:53:26 +00:00
Gareth Hughes
b3678f1080 Some more minor cleanups of macros. 2001-03-23 06:07:31 +00:00
Gareth Hughes
8b7dfa8526 Remove compiler warnings about ASSERT_OUTSIDE_BEGIN_END() macro. 2001-03-23 06:01:03 +00:00
Gareth Hughes
7387394e59 Initial demo of GL_EXT_texture_filter_anisotropic extension. 2001-03-22 15:24:15 +00:00
Brian Paul
19bf744556 enable GL_ARB_texture_env_combine and GL_ARB_texture_env_dot3 in _mesa_enable_sw_extensions() 2001-03-22 14:42:24 +00:00
Jouk Jansen
3427e3547e Modified Files:
Mesa/si-glu/libnurbs/nurbtess/monoTriangulation.cc
 	Mesa/si-glu/libnurbs/nurbtess/sampleCompRight.cc

 gluos.h included in order to bypass compiler warnings on unreachable code on
 VMS systems.
----------------------------------------------------------------------
2001-03-22 11:41:40 +00:00
Jouk Jansen
df1e73af7a Modified Files:
Mesa/descrip.mms Mesa/mms-config Mesa/demos/descrip.mms
 	Mesa/si-glu/include/gluos.h
 	Mesa/si-glu/libnurbs/internals/bufpool.h
 	Mesa/si-glu/libnurbs/internals/mysetjmp.h
 	Mesa/src-glut/descrip.mms
 Added Files:
 	Mesa/si-glu/descrip.mms Mesa/si-glu/mesaglu.opt

 changes needed to compile SI-GLU on VMS.

----------------------------------------------------------------------
2001-03-22 11:38:36 +00:00
Gareth Hughes
ea1bfcc80a Remove formats that no longer exist. 2001-03-22 06:26:18 +00:00
Gareth Hughes
2f177e2906 Minor updates. 2001-03-22 06:25:23 +00:00
Gareth Hughes
7acad72a1a Fix texture format enum values (Brian Paul). 2001-03-22 06:23:56 +00:00
Brian Paul
8806915c3a added GL_ARB_texture_env_dot3 enums 2001-03-22 04:57:09 +00:00
Brian Paul
a13df148df minor comment update 2001-03-22 04:56:50 +00:00
Brian Paul
1a59875367 added GL_ARB_texture_env_combine, GL_ARB_texture_env_dot3 2001-03-22 04:54:58 +00:00
Brian Paul
e9313a64c1 clean-up in _swrast_choose_triangle() 2001-03-22 04:54:08 +00:00
Gareth Hughes
d2733fa196 Add PolygonOffset driver callback. 2001-03-22 00:36:27 +00:00
Brian Paul
8ac1f97e9e added teximage rescaling code. untested at this point 2001-03-21 18:23:39 +00:00
pesco
6f3178a3be * src/swrast_setup/ss_tritmp.h (quad): Changed name of this function to
quadfunc.
* common_rules.make: Use tabs for command indentation.
2001-03-21 17:11:32 +00:00
Brian Paul
1639518b64 minor updates for 3.5 2001-03-21 16:47:33 +00:00
Brian Paul
935d5e5daa use new texture conversion code, still have to do image rescaling 2001-03-21 16:47:19 +00:00
Brian Paul
0299ad7532 renamed some vars, added a bunch of comments 2001-03-21 16:44:08 +00:00
Brian Paul
c8cfbf7c19 minor re-org in sample_depth_texture() 2001-03-21 16:04:49 +00:00
Brian Paul
2743def830 sync'd with the latest changes in XFree86 (cygwin stuff) 2001-03-21 16:00:17 +00:00
Gareth Hughes
fa6be6e77a Fix compilation with GLU 1.1 2001-03-21 02:47:32 +00:00
Gareth Hughes
f5328c534d Make ESC quit. 2001-03-21 02:44:36 +00:00
Gareth Hughes
16cdc6ab12 Revert back to new tessellator, check version string to be sure we're
running with a valid GLU library.
2001-03-21 02:43:14 +00:00
Brian Paul
56671022f9 depth images were broken by latest teximage changes, this fixes the problem 2001-03-21 01:08:37 +00:00
Gareth Hughes
b5f0de18b9 Make COPY_FLOAT available to a wider audience. 2001-03-20 18:35:23 +00:00
Gareth Hughes
23f48064b8 More updates. Radeon tnl module still disabled by default. 2001-03-20 18:33:41 +00:00
Brian Paul
815ad714b4 fixes to make old GLU code compile with new GLU 1.3 header 2001-03-20 17:56:10 +00:00
Jouk Jansen
f3e3178751 Committing in .
Modified Files:
 	Mesa/src/descrip.mms Mesa/src/texutil_tmp.h

 -Updated VMS makefile
 -__FUNCTION__ is not a defined on VMS (and maybe other systems) For VMS
  __FUNCTION__ is defined to  in texutil_tmp.h



----------------------------------------------------------------------
2001-03-20 10:18:13 +00:00
pesco
68af9a0773 * common_rules.make: Created to hold the conditional build rule
override. All Makefile.am's updated.
2001-03-20 00:33:18 +00:00
Brian Paul
4e856077b7 fix for gl_ztrick bug (Ove Kaaven) 2001-03-19 22:45:52 +00:00
pesco
6507d9249d * si-glu/libnurbs/: Undid move of glimports.h, mystdio.h, mystdlib.h. 2001-03-19 17:52:02 +00:00
Alan Hourihane
e18599a6c3 fix glxinfo to query current display. 2001-03-19 13:58:45 +00:00
Alan Hourihane
92eac1c765 fix cast 2001-03-19 13:27:15 +00:00
Keith Whitwell
b048d8e084 New files 2001-03-19 02:28:59 +00:00
Keith Whitwell
7098924599 Split driver struct into swrast/tnl/core components. 2001-03-19 02:25:35 +00:00
pesco
d9bf6ccce9 * gen_srclists.sh: Use getopt to parse the command line. Added command
line option -n (dry run) and -h. Directory list can be specified on the
command line.
Added command line options -p and -l. Some other tweaks.

* si-glu/libnurbs/glimports.h, si-glu/libnurbs/mystdio.h,
si-glu/libnurbs/mystdlib.h: Pulled these out of
si-glu/libnurbs/interface and si-glu/libnurbs/internals. All include
paths updated.
2001-03-18 15:40:45 +00:00
Gareth Hughes
371ef9c058 Add missing header file include. 2001-03-18 14:06:25 +00:00
Gareth Hughes
ad7ce73609 Remove #endif. 2001-03-18 14:05:32 +00:00
Gareth Hughes
264c6fd177 Make assertions take new GLchan formats into account. 2001-03-18 13:40:58 +00:00
Gareth Hughes
3fa4bd008c Fix error message. 2001-03-18 13:37:18 +00:00
Gareth Hughes
7ea33579e7 Fix header info. 2001-03-18 13:34:24 +00:00
Gareth Hughes
6b406bf09d Remove old code, fix a few comments. 2001-03-18 13:31:52 +00:00
pesco
2f9757f344 Forgot to add newly created files. 2001-03-18 13:06:19 +00:00
Gareth Hughes
2c3d34c905 - Port 3.4 texture utils, texture format work to 3.5 (including new
FetchTexel routines).
- Initial hooks for GL_EXT_texture_filter_anisotropic.
2001-03-18 08:53:49 +00:00
Keith Whitwell
6e550baa0a Fix lineloops. 2001-03-18 00:46:04 +00:00
Keith Whitwell
bcc513ebf5 Fix cut&paste bug exposed by clipbug.c demo. 2001-03-17 18:04:54 +00:00
Keith Whitwell
47489c0721 Remove dead #define.
Add case for triangles culled front and back -- not handled by the
culling code inside swrast triangle routines.
2001-03-17 17:43:04 +00:00
Keith Whitwell
c6e2d29cde Revert earlier changes protecting against null VB->TexCoordPtr[x]. Do
this a better way via check_tex_sizes().
2001-03-17 17:31:42 +00:00
Brian Paul
eb11fa73ec added SI GLU info 2001-03-17 00:47:19 +00:00
Brian Paul
47cbbcc1b6 updated for SGI SI GLU 2001-03-17 00:45:01 +00:00
Brian Paul
1bb327ebdb SGI SI GLU 1.3 header 2001-03-17 00:29:47 +00:00
Brian Paul
84c8964116 added CCFLAGS and CPLUSPLUS definitions 2001-03-17 00:27:04 +00:00
Brian Paul
77cc447b96 SGI SI GLU library 2001-03-17 00:25:40 +00:00
Brian Paul
24fab8e250 removed ARB_texture_env_add bool flag, use EXT_texture_env_add flag 2001-03-15 18:21:01 +00:00
Brian Paul
b082abc28f use IROUND() instead of (int) cast (Klaus Niederkrueger) 2001-03-15 16:45:30 +00:00
Gareth Hughes
c6742cedee Fix typo. 2001-03-14 08:51:09 +00:00
Gareth Hughes
3709db0e17 Initial templates for immediate mode fastpaths, or custom tnl modules.
Completely untested and incomplete.  More to follow.
2001-03-13 17:39:56 +00:00
Gareth Hughes
3df1e04b10 Nope, -ansi spoils that... 2001-03-12 02:24:53 +00:00
Gareth Hughes
2a938d3ab7 Undo -D_POSIX_SOURCE change, fix the way the katmai support test is
done.
2001-03-12 02:13:39 +00:00
Gareth Hughes
79b2d13ae2 - Add -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L to linux builds, we've
been using it with the DRI for long enough without any issues and we
  need it to include the katmai functions.
- Make katmai assembly work with the debug tests.
- A few general cleanups.
2001-03-12 02:02:36 +00:00
Gareth Hughes
d4eb665c60 Add missing header file. 2001-03-12 01:32:20 +00:00
Gareth Hughes
467037de22 Add missing header file include. 2001-03-12 01:06:44 +00:00
Gareth Hughes
22144ab755 Consistent copyright info (version number, date) across all files. 2001-03-12 00:48:37 +00:00
Gareth Hughes
57ffddba98 Minor cleanups. 2001-03-11 23:55:19 +00:00
Gareth Hughes
de6a2e0d19 Clean up install, restore for exec vtxfmts. 2001-03-11 23:49:20 +00:00
Gareth Hughes
d8aa0269cd Support for swappable tnl modules.
Core Mesa provides a neutral tnl module that verifies the currently
module before installing the tnl function pointers in a lazy fashion.
It also records which tnl functions have been swapped out, and only
restores these when tnl modules themselves are swapped.

Fallback strategies:

Drivers set a bitmask of dangerous stage changes.  When such a state
change occurs, the driver should restore the neutral tnl module via
_mesa_restore_exec_vtxfmt().  The neutral tnl module will call
_mesa_update_state(), followed by ctx->Driver.ValidateTnlModule() if the
validation bitmask matches the new state bitmask.  The driver should
call _tnl_wakeup_exec() if it can no longer handle the current state,
which will revert to the default tnl module.  In this case, previous
vertices should be replayed as required (depending on the current
primitive) after the new tnl module is installed.

If the driver uses chooser functions for any part of the tnl module,
these should generally be reinstalled as part of the fallback to the
neutral tnl module.  For example, if the lighting state changes, a
driver might fall back to the neutral tnl module, verify that the
current lighting state can be handled, and use the chooser function to
pick the most efficient implementation of the current lighting state.

It is up to the drivers to detect and handle fallback cases caused by
tnl function calls themselves (such as glTexCoord4f* if the current tnl
module can't handle projected textures, for example).
2001-03-11 18:49:11 +00:00
Gareth Hughes
b1b4036656 Add a couple of missing functions. 2001-03-10 02:50:42 +00:00
Gareth Hughes
53e4bf9afd More generic vtxfmt template, useful for creating neutral tnl module as
well as fallback functions for driver tnl modules.
2001-03-09 16:08:13 +00:00
Brian Paul
ca8c6a0337 fixed RBGA ifdef typo 2001-03-08 22:27:41 +00:00
Brian Paul
95e02a210e do fog interpolation if INTERP_FOG is defined, not when INTERP_Z is defined 2001-03-08 17:33:33 +00:00
Brian Paul
896e8bd2d7 processed by indent to improve readability 2001-03-08 17:17:28 +00:00
Brian Paul
417ed16a88 changed bincoeff var to GLfloat, fixes bug introduced in previous check-in 2001-03-08 17:15:01 +00:00
Brian Paul
a28fa45ab7 test 16-bit/channel rendering 2001-03-08 15:24:18 +00:00
Brian Paul
01915e90e6 More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work. 2001-03-08 15:23:46 +00:00
Brian Paul
eac57f009e added an assertion in the init code, just to be safe 2001-03-07 23:22:08 +00:00
Jon Taylor
9cb9401e87 Misc build fixes 2001-03-07 20:42:14 +00:00
Gareth Hughes
4da75f6d91 Add missing copy in _mesa_noop_Color4fv(). 2001-03-07 18:16:40 +00:00
Brian Paul
b51b0a847d fixed a bunch of g++ warnings/errors. Compiling with g++ can help find lots of potential problems 2001-03-07 05:06:11 +00:00
Brian Paul
249aebdd35 _MinMagThresh[] should be GLfloat 2001-03-07 04:50:49 +00:00
Brian Paul
90ea526114 added some casts in the 16-bit GLchan macros, just to be safe 2001-03-07 03:20:38 +00:00
Brian Paul
be3d539dac added Driver.BlendColor() function, for completeness 2001-03-07 00:21:32 +00:00
Brian Paul
ac859a4cbd fixed segfaults when tex unit 1 enabled, but not unit 0 (conform) 2001-03-05 22:40:10 +00:00
Brian Paul
75280a2c74 added missing ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH() macros 2001-03-05 22:18:23 +00:00
Keith Whitwell
89700a4abd DO_POINT renamed DO_POINTS 2001-03-05 19:54:03 +00:00
Keith Whitwell
0ceb82b838 Changes for ffb 2001-03-05 18:52:18 +00:00
Keith Whitwell
3db5374e66 Fix typo 2001-03-05 18:04:38 +00:00
Brian Paul
d395251b35 GL_EXT_secondary_color test 2001-03-05 17:50:35 +00:00
Brian Paul
d49081302a GL_EXT_fog_coord test 2001-03-05 17:31:57 +00:00
Keith Whitwell
3c646597cf Add missing cases for viewport transform. Remove INVALIDATE_STORED_VERTICS
macro
2001-03-05 16:41:47 +00:00
Brian Paul
a11c0bcf97 replaced gl_test_os_katmai*() with _mesa_test_os_katmai*() 2001-03-05 15:57:59 +00:00
Brian Paul
865322f931 more clean-ups 2001-03-03 21:11:32 +00:00
Brian Paul
d62269757b used indent to clean-up the code 2001-03-03 20:59:06 +00:00
Brian Paul
188f2949ea more namespace clean-ups 2001-03-03 20:56:59 +00:00
Brian Paul
0883634178 lots of gl_*() to _mesa_*() namespace clean-up 2001-03-03 20:33:27 +00:00
Brian Paul
19bbfc6263 optimized lambda calculation (Klaus Niederkrueger) 2001-03-03 00:37:27 +00:00
Brian Paul
85312e6db1 changed AlphaFunc() ref from GLclampf to GLchan 2001-03-03 00:12:47 +00:00
Brian Paul
eb2b63877a fixed _mesa_getenv() weirdness 2001-03-02 16:01:22 +00:00
Brian Paul
6a2d72ecff fixed mistake in alpha buffer clear test 2001-03-01 18:30:47 +00:00
Keith Whitwell
6da33b1249 Uncomment some defaults. 2001-03-01 18:18:05 +00:00
Keith Whitwell
0fe593a71e Bugfixes for vertex format, templates 2001-03-01 17:40:14 +00:00
Brian Paul
d89c87ac40 added s/w alpha buffer clearing 2001-03-01 00:05:05 +00:00
Brian Paul
b4203c1c49 removed some bogus error checks 2001-02-28 19:31:39 +00:00
Brian Paul
0221e4d6c8 Now there's four possible display modes:
1. normal, shadowed rendering
2. display depth texture image
3. display depth texture mapped onto scene
4. render grayscale scene where gray level = distance from light source
2001-02-28 18:41:50 +00:00
Keith Whitwell
feb555af03 Templates are in working order. 2001-02-28 18:19:27 +00:00
Brian Paul
be3602da41 GLvisual inside GLframebuffer is no longer a pointer, copy the struct instead.
Added context/drawbuffer visual config sanity checking in _mesa_make_current2().
Added some 'const' keywords.
2001-02-28 00:27:48 +00:00
Brian Paul
6a9851d72d fixed glitches in error checking of imaging extensions 2001-02-27 22:33:59 +00:00
Brian Paul
bf8b5f99a1 signal _NEW_TEXTURE in all teximage functions 2001-02-27 22:16:27 +00:00
Brian Paul
2eb801cda2 added fog coord clamping 2001-02-27 21:58:59 +00:00
Brian Paul
8753b1c397 colortable w/ size=0 wasn't handled correctly 2001-02-27 16:42:01 +00:00
Keith Whitwell
bed4c5bf58 Initialize Line._Width 2001-02-27 16:14:35 +00:00
Brian Paul
18c516655f more tweaks 2001-02-27 00:13:25 +00:00
Brian Paul
01a5dd879b minor extension tweaks 2001-02-27 00:05:27 +00:00
Brian Paul
6975540db2 Disable most extensions by default. Drivers should enable them as needed.
Renamed gl_*() functions as _mesa_*().
2001-02-26 23:58:12 +00:00
Brian Paul
806e20f463 fixed extension checking in _mesa_BlendEquation() 2001-02-26 22:07:03 +00:00
Brian Paul
511378b05d added filtering option, compute shadow tex size from window size 2001-02-26 18:26:32 +00:00
Brian Paul
eb198d2702 tiny change to a gl_problem() call 2001-02-26 18:25:25 +00:00
Brian Paul
1f57563b9d added a cube map error check 2001-02-26 18:24:55 +00:00
Brian Paul
30038ecaa2 bilinear sampling of depth textures 2001-02-26 18:24:37 +00:00
Keith Whitwell
feca368c29 Template work 2001-02-24 18:25:52 +00:00
Brian Paul
0d04827f6d another fix in _mesa_stencil_and_ztest_pixels() for hardware fallbacks 2001-02-23 23:14:11 +00:00
Brian Paul
74b775e14d fixed bug in _mesa_stencil_and_ztest_pixels() found w/ DRI mga driver 2001-02-23 20:08:29 +00:00
Brian Paul
dab76b4dc5 improvements to regions_overlap() function 2001-02-22 17:59:24 +00:00
Brian Paul
ea83bacf9c removed some bogus code 2001-02-22 17:50:13 +00:00
Jouk Jansen
69c283e061 Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 old files removed/ new files included in VMS makefile
----------------------------------------------------------------------
2001-02-22 08:52:30 +00:00
Brian Paul
abe094e4a1 fixed GL_LUMINANCE_ALPHA bug in fetch_2d_texel() 2001-02-21 16:02:27 +00:00
Keith Whitwell
4eebc90a17 Added GLvector4chan type, removed lots of CHAN_TYPE ifdefs. 2001-02-20 18:28:52 +00:00
Brian Paul
8bbc71f2eb more 3.5 updates 2001-02-20 17:08:55 +00:00
Brian Paul
0a0595f2d3 added extension #ifdef/#endifs 2001-02-20 17:06:35 +00:00
Brian Paul
03ca5eb58f added shadow extensions 2001-02-20 17:05:04 +00:00
Brian Paul
d6c3f73fb4 added shadowtex 2001-02-20 17:04:52 +00:00
Brian Paul
1399d7650d demo of GL_SGIX_shadow 2001-02-20 16:43:50 +00:00
Brian Paul
c499ce31ba Implemented GL_SGIX_shadow and GL_SGIX_shadow_texture.
Added some const keywords in the s/w texturing code.
2001-02-20 16:42:25 +00:00
Brian Paul
0c75c4c417 plug in fallback teximage DD functions 2001-02-19 20:14:57 +00:00
Brian Paul
2aadbf41df Updated Driver.CopyTexImage[12]D and Driver.CopyTexSubImage[123]D functions
so they work like the other teximage functions.  Added fallback routines to
texstore.c for drivers to use.
2001-02-19 20:01:41 +00:00
Brian Paul
aaf5a9bb08 added a bunch of extensions (Ray Tice) 2001-02-19 18:28:59 +00:00
Brian Paul
e75d2424e5 Changed FetchTexel() function pointer arguments.
Implemented glGetTexImage(format=GL_COLOR_INDEX).
Changed _mesa_unpack_depth_span() args.
Minor changes/clean-ups in mtypes.h.
Histogram counter component sizes were wrong.
2001-02-17 18:41:01 +00:00
Brian Paul
8f9a594ac8 added MESA_GLX_FORCE_CI env var (useful for conformance testing) 2001-02-17 00:17:31 +00:00
Brian Paul
f7e1dfeaef Work in glGetTexImage() to return GL_COLOR_INDEX images.
Prototype code for GL_SGIX_depth_texture / more flexible teximage code.
2001-02-17 00:15:39 +00:00
Brian Paul
23e8d46e07 moved depth/index/stencil span packing into image.c 2001-02-16 23:29:14 +00:00
Brian Paul
8a42f6b359 added n-key to toggle nice fog, other minor clean-ups 2001-02-16 21:48:16 +00:00
Keith Whitwell
4539e9195d Fix state bitmasks for invalidating line,tri,point functions. (won't fix
the fog problem, I don't think)
2001-02-16 18:56:46 +00:00
Keith Whitwell
46b0988c67 Allow swrast to cope (fairly) cleanly with GL_SEPERATE_SPECULAR when
texturing is not enabled, and without requiring the two colors be
added externally.

As a part of this, collapsed the decomposition of quads into triangles
inside swrast to be hardwired into _swrast_Quad; removed s_quads.[ch].

Removed checks on texture state from t_vb_light.c, which was previously
required by swrast.

Moved the t_dd_ templates to a new directory.
2001-02-16 18:14:41 +00:00
Keith Whitwell
2448fc7dee Fixed conform problems with recent material tracking change.
Remove redundant 'update_materials' stage.
Fix conform segfault with seperate specular colors in mustpass.c.  These
tests still fail, however.
2001-02-16 00:35:34 +00:00
Brian Paul
86ca15ece7 minor scissor optimizations (Klaus Niederkrueger) 2001-02-15 22:59:01 +00:00
Keith Whitwell
c6b2a92613 Fix propogation of material values in VB's that don't reach the lighting
stage.  (Materials now treated more like colors, etc.).

Continue whipping the dd templates into shape.

Remove old NormalLength code; may come back as a driver helper, but not
useful for, eg. hardware t&l drivers.
2001-02-15 01:33:52 +00:00
Brian Paul
4e52e192b2 fixed a CI-mode spot light conformance failure, but still not clear why 2001-02-14 23:00:42 +00:00
Brian Paul
4de3ded28a updated with 3.4 and 3.4.1 entries 2001-02-14 22:59:50 +00:00
Brian Paul
4e492363f0 removed a misplaced _mesa_logicop_ci_span() call 2001-02-14 22:40:21 +00:00
Brian Paul
b5fb4fd55b fixed a CI mode segfault, minor clean-ups 2001-02-13 23:59:34 +00:00
Brian Paul
88c5ceb650 fixed an assertion 2001-02-13 23:58:38 +00:00
Brian Paul
c3a4dbfbd6 fixed a few CI mode span bugs and a dither bug 2001-02-13 23:57:48 +00:00
Brian Paul
45323646bd fixed bug in gl_validate_all_lighting_tables() found with CI mode conformance tests 2001-02-13 23:55:30 +00:00
Brian Paul
10686f42c9 removed bogus assertions 2001-02-13 23:54:12 +00:00
Brian Paul
dc866313af gl_error clean-ups 2001-02-13 23:51:34 +00:00
Brian Paul
8f28f4850b fixed GL_SET bug 2001-02-13 23:50:25 +00:00
Brian Paul
479fa1db1d added debug assertions to be sure drivers initialize all required function pointers 2001-02-12 19:04:30 +00:00
Brian Paul
a81b3532f7 added ctx->Driver.ResetLineStipple, misc clean-up 2001-02-12 18:32:26 +00:00
Brian Paul
3c84ab90f2 fixed RGB over/underflow bug for tiny triangles (bug 128969) 2001-02-12 17:02:00 +00:00
Brian Paul
15bf1cd129 minor updates to sync w/ XFree86 changes 2001-02-09 23:39:02 +00:00
Brian Paul
ccc8b9239c minor changes from XFree86 (dawes) 2001-02-09 23:23:43 +00:00
Jouk Jansen
18ce0f1254 Committing in .
Modified Files:
 	Mesa/src-glut/glut_event.c Mesa/src-glut/glut_get.c
 	Mesa/src-glut/glut_init.c Mesa/src-glut/glutint.h

 Patch for compilation on very old VMS (version 6.2 and earlier)

----------------------------------------------------------------------
2001-02-09 12:19:17 +00:00
Brian Paul
9db3f95ace fixed bytesPerValue bug in OSMesaGetDepthBuffer() 2001-02-08 23:52:29 +00:00
Brian Paul
1f12a07380 fixed bugs in _mesa_clear_depth_buffer(), bug #131366 2001-02-08 15:57:01 +00:00
Brian Paul
1ceda0f84f GLchan fixes 2001-02-07 19:02:23 +00:00
Brian Paul
9a0b12ab00 fixed texel indexing bug in _mesa_GetTexImage() 2001-02-07 18:59:45 +00:00
Brian Paul
b4736f5e17 added divide by zero checks 2001-02-07 18:44:55 +00:00
Brian Paul
5c55aa4e61 fixed divide by zero problem 2001-02-07 18:36:52 +00:00
Brian Paul
a1f1586bcb added some code for proxy texture tests 2001-02-07 16:27:41 +00:00
Keith Whitwell
b8e1c70ec1 Correctly calculate size for disabled texcoord arrays. 2001-02-07 16:00:58 +00:00
Jouk Jansen
fb1565bcdd VMS compile update 2001-02-07 09:15:41 +00:00
Brian Paul
6830123a4c check texture texel type before using optimized sampling functions 2001-02-07 03:55:31 +00:00
Brian Paul
43bc364af4 remove unused functions 2001-02-07 03:53:07 +00:00
Brian Paul
03d967abb5 new texture image routines work now 2001-02-07 03:30:07 +00:00
Brian Paul
6628bc9cff made some changes to the initialization of gl_texture_image fields 2001-02-07 03:27:41 +00:00
Gareth Hughes
dde2da64b5 Force texture download every time to handle lazy texture downloads. 2001-02-07 03:04:58 +00:00
Brian Paul
78ad878b66 updated texture image handling - STILL UNTESTED 2001-02-06 23:35:49 +00:00
Brian Paul
f378ab825c added a number of debugging tests to be sure drivers handle texture images correctly 2001-02-06 23:35:26 +00:00
Brian Paul
8e39ad2cd6 Overhaul of texture image handling.
1. gl_texture_image struct's Data pointer points to images in driver's format.
2. Added FetchTexel() function pointer to struct gl_texture_image.
3. Changed Driver Tex[Sub]Image functions, return void now.
4. Texture storage/fetch code in new texstore.c file.
5. Removed texture.[ch] - functions moved to state.c

Note: FX driver updates not finished yet.
2001-02-06 21:42:48 +00:00
Brian Paul
16461f7c53 added _mesa_adjust_image_for_convolution() 2001-02-06 17:22:16 +00:00
Keith Whitwell
d1baa05439 Use a lookup table to compute exponents in tnl fogging code. Slightly
clean up the shine table lookup macro.
2001-02-06 04:06:34 +00:00
Brian Paul
8fd9f1748d misc updates to match latest device driver changes 2001-02-06 00:03:47 +00:00
Brian Paul
228748bc49 added mesa_profile extern decl 2001-02-05 19:17:31 +00:00
Brian Paul
d8bc5a9eba replaced frustrum with frustum 2001-02-05 18:48:52 +00:00
Jouk Jansen
db7a3318aa Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Updated VMS make-files

----------------------------------------------------------------------
2001-02-05 08:56:12 +00:00
Keith Whitwell
71270195d5 rework to correctly respect _ac_import_range() 2001-02-04 00:47:28 +00:00
Keith Whitwell
6e9f8b7cdb Fast no-copy drawarrays for large tristrips 2001-02-04 00:44:36 +00:00
Gareth Hughes
fe69cb4b9b Some more work on interal debugging, timing routines for things that
will have implementations in assembly code.  To come: texture image
conversions, more of internal T&L pipeline and so on.
2001-02-03 08:41:03 +00:00
Jouk Jansen
6d689e8a69 Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Updates VMS compile-support
----------------------------------------------------------------------
2001-01-31 14:10:16 +00:00
Brian Paul
eeb861df0b make gluPerspective() call glMultMatrix() instead of glFrustum() to get correct error semantics 2001-01-30 18:08:51 +00:00
Brian Paul
d68b699291 added packed types to glGetMinMax and glGetHistogram error checks 2001-01-30 17:46:34 +00:00
Brian Paul
e56cc3970f fixed half pixel offset bug in aa point code 2001-01-30 16:38:20 +00:00
Gareth Hughes
f2515fa83e Upgrade to (patched) version 7 of glext.h 2001-01-30 15:02:34 +00:00
Brian Paul
426628c374 last segment of AA stippled lines wasn't drawn 2001-01-29 23:38:41 +00:00
Brian Paul
326f9ddd8a fixed inverted Y coord for dithering in write_span_DITHER_5R6G5B_ximage() 2001-01-29 22:40:23 +00:00
Brian Paul
ba70e59e82 GL_SHADE_MODEL wasn't popped correctly 2001-01-29 22:15:44 +00:00
Brian Paul
961b7cad05 removed unused vars 2001-01-29 22:10:37 +00:00
Brian Paul
184a575a00 only compute separate specular if texturing really enabled 2001-01-29 22:10:24 +00:00
Brian Paul
407b487017 fixed computation of _MultiTextureEnabled (again) 2001-01-29 21:47:13 +00:00
Keith Whitwell
d98fdad3bf Update implementations of Driver.Clear(). 2001-01-29 20:56:32 +00:00
Keith Whitwell
5c1e7fa6ee Removed knowledge of swrast Clear/Bitmap/Accum/Draw/Read/CopyPixels
functions from core mesa -- if drivers need these fallbacks they
must now call them themselves.

Introduced hooks for clip-vertex-interpolation and the rendering
of clipped lines and polygons.  Allows drivers to interpolate
their hardware-format vertices directly.  Used in dri drivers to
replace fastpath code.

Slight optimizations to pipeline build/run routines.
2001-01-29 20:47:39 +00:00
Brian Paul
4b90e68ac6 optimized lambda computation (Klaus Niederkrueger) 2001-01-29 18:51:25 +00:00
Brian Paul
e5dfe384ad updates to the trace extension 2001-01-29 16:18:37 +00:00
Brian Paul
d6dd0fceb1 updated spec 2001-01-29 16:10:18 +00:00
Brian Paul
f3da389ae0 redo _mesa_PopAttrib() to call Mesa state functions so derived state is updated 2001-01-24 15:27:10 +00:00
Brian Paul
ab36c9aa1c removed the unused/broken GL_PGI_misc_hints extension 2001-01-24 04:56:19 +00:00
Brian Paul
9533fd1842 minor tweaks 2001-01-24 00:07:01 +00:00
Brian Paul
74b493a5e6 Lots of GLchan datatype changes.
Added GLvector4us datatype in math/m_vector.[ch]
Added _math_trans_4us() in math/m_translate.[ch]
Choose GLvector4ub, GLvector4us, GLvector4f at compile time based on CHAN_BITS.
Made Driver.ClearColor() and Driver.ClearIndex() optional driver functions.
Changed args to Driver.ClearColor(), updated drivers.
Reordered files in Makefile.X11
2001-01-24 00:04:58 +00:00
Brian Paul
125fddc31d added DestroyHeads() to test clean-up code 2001-01-23 23:45:05 +00:00
Brian Paul
6140a8c65f minor tweaks 2001-01-23 23:44:39 +00:00
Brian Paul
4e3e9ac8fb added support for 4 texture units 2001-01-23 23:44:15 +00:00
Brian Paul
2b2e62154d space-bar = pause animation 2001-01-23 23:43:53 +00:00
Brian Paul
b6bcae5698 Replaced struct gl_visual with struct __GLcontextModesRec from glcore.h.
Replace "RGBAMode" with "rgbMode", etc.
Other minor clean-ups.
2001-01-23 23:39:36 +00:00
Brian Paul
ab0c886a6c added dispatch override mechanism, used by trace extension 2001-01-23 23:35:47 +00:00
Brian Paul
f2718b0966 fixed glTexSubImage error check bug #128775 2001-01-23 23:35:23 +00:00
Brian Paul
39927e60ea test check-in 2001-01-23 23:29:15 +00:00
Keith Whitwell
c0bcd2ca99 Fixes for performance bug on compiled array element paths. 2001-01-17 02:49:38 +00:00
Brian Paul
547bbcabff updated ctx->Driver functions for s/w setup 2001-01-16 21:16:56 +00:00
Brian Paul
d292b83d1a fixed a small error in import_color(), include m_translate.h 2001-01-16 15:25:11 +00:00
Keith Whitwell
d43a5943d8 Fix several conformance problems. Hack solution to line stipple problem. 2001-01-16 05:29:42 +00:00
Brian Paul
230928ad5f removed unneeded TXTR_COORD macros (Stephen Tse) 2001-01-15 20:04:28 +00:00
Keith Whitwell
3fd01320f1 Fixed conform feedback and drawelements tests.
Use correct pv when rasterizing unfilled polys.
2001-01-14 06:14:21 +00:00
Keith Whitwell
ab8b047ae5 fix conform dlist test 2001-01-13 18:28:19 +00:00
Keith Whitwell
8415686ea2 Use correct pv in swrast lines routines 2001-01-13 07:13:28 +00:00
Keith Whitwell
321f67c472 Fix crash in book/stencil.
Allow drivers to perform the perspective divide themselves.  Assembly
to do cliptesting without perspective divide for size-4 vectors.
2001-01-13 05:48:25 +00:00
Keith Whitwell
a087c7421b Resync with new XFree version of this file 2001-01-13 05:47:06 +00:00
Brian Paul
3f9ee180a8 initialize Driver.RenderPrimitive to _swsetup_RenderPrimNoop 2001-01-12 22:34:27 +00:00
Brian Paul
e448d6cf0c Added PointSize and PointParametersfv to dd interface, for completeness.
Clean-up and updated comments in dd.h file.
2001-01-09 00:02:55 +00:00
Keith Whitwell
ce656b6a0a Fixed 'IRound' to 'IROUND' in mmath.h
Fixed fallback path for drawarrays/_tnl_hard_begin.

Removed disabled debug code.
2001-01-08 21:55:59 +00:00
Keith Whitwell
bfa023921c Still need 'DD_TRI_CULL_FRONT_BACK' 2001-01-08 17:42:13 +00:00
Keith Whitwell
d7fc376de8 Add call to Driver.RenderPrimitive() 2001-01-08 17:41:15 +00:00
Keith Whitwell
7a1f3a37a1 revert XMesaCreateContext changes 2001-01-08 04:55:22 +00:00
Keith Whitwell
b980b2eeb6 Add a 'RenderPrimitive' callback to t_vb_render.c. Helps out drivers
that used to require a 'ReducedPrimitiveChange' callback.

Various compilation fixes for XFree86.

Reverted to the older version of glcore.h used internally in XFree86, and
moved it to 'Mesa/include/GL/internal/glcore.h', for compatibility with
XFree86.
2001-01-08 04:09:41 +00:00
Keith Whitwell
44d8de433e Bring the FX driver into line with core mesa changes. 2001-01-08 04:06:56 +00:00
Keith Whitwell
e9bf776711 Modify X11 driver and fake glx to store a GLcontext
(ie a 'struct __GLcontextRec *') instead of an 'XMesaContext'.

This is to fix conflicts in XFree86 where both the indirect XMesaContext
and the GLcontext were calling themselves __GLcontextRec's.
2001-01-08 04:06:20 +00:00
Keith Whitwell
78477947de Moved glcore.h to a location prefixed by 'GL/internal', for compatibility
with XFree86 and the SI code there.
2001-01-08 03:56:53 +00:00
Gareth Hughes
ba8f6172bd Implementation of GL_EXT_texture_env_dot3. 2001-01-06 22:46:13 +00:00
Gareth Hughes
c851646050 Add GL_POINTS as a primitive, including with CVA DrawElements. Useful
for testing non-triangle primitives on hardware driver fastpaths.
2001-01-06 20:38:03 +00:00
Brian Paul
8cbc573eae Fixed bug in MinMagThresh computation.
Renamed gl_texture_pixels() to _swrast_texture_fragments()
2001-01-05 21:28:31 +00:00
Jouk Jansen
2d7e25c9ff Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 VMS makefile update
----------------------------------------------------------------------
2001-01-05 08:09:46 +00:00
Keith Whitwell
f4b02d1a26 various compilation/warning fixes 2001-01-05 05:31:42 +00:00
Keith Whitwell
58e9917053 Remove 'pv' parameter from Line/Tri/Point funcs. The provoking vertex
is always the last vertex parameter.
Modify clipping to preserve pv colors.
Modify swrast and X11 driver to expect the pv in the last vertex
(was looking in the first vertex previously).
Remove all handling of flatshading from swrast_setup.

Allow drivers to override the unclipped render tabs in tnl_render_stage
directly.  (Like in 3.4).  Removed fxsimplerender stage.

Modified t_vb_rendertmp.h to remove the need for 'parity' arguments
in RENDER_TRI macros.
2001-01-05 02:26:48 +00:00
Brian Paul
f22c04cdae added underflow check in validate_shine_table() 2001-01-04 16:22:18 +00:00
Brian Paul
6517211e12 added divide by zero check 2001-01-04 15:32:32 +00:00
Brian Paul
2fd9c8690f changed some point functions, new picking code 2001-01-04 15:32:10 +00:00
Brian Paul
63cca75e63 minor bug fixes 2001-01-04 15:31:38 +00:00
Brian Paul
1c768645c5 added divide by zero check 2001-01-03 22:56:23 +00:00
Brian Paul
d14fce03f0 added divide by zero checks 2001-01-03 22:55:26 +00:00
Brian Paul
08dfacd425 New point rasterization functions based on template code that
handles CI/RGB, texture, antialiasing, attenuation, etc.
2001-01-03 22:17:16 +00:00
Brian Paul
6532db9868 More color macro clean-ups.
FLOAT_TO_CHAN() macro removed.
2001-01-03 15:59:30 +00:00
Brian Paul
3b399df638 minor clean-up 2001-01-03 15:56:41 +00:00
Jon Taylor
c1d89d4391 Added missing #include "mmath.h" 2001-01-03 02:43:46 +00:00
Brian Paul
a580e1adb7 missed a few color macro changes 2001-01-02 22:05:55 +00:00
Brian Paul
3041d05bbc Removed fixed.h (GLfixed now in mtypes.h, fixed-pt macros in mmath.h)
Clean-up of color conversion macros.
New mmath.h macros (IROUND, IFLOOR, ICEIL, FRAC) used in various places.
2001-01-02 22:02:51 +00:00
Brian Paul
8446d1bab1 include state.h 2001-01-02 21:40:57 +00:00
Brian Paul
6f89984fed minor GLchan-related changes 2001-01-02 21:09:50 +00:00
Jouk Jansen
ef68e7bf71 Committing in .
Modified Files:
 	Mesa/demos/descrip.mms Mesa/src/descrip.mms
 	Mesa/src/dispatch.c

 -Updated VMS compile suppport
 -Included glthread.h in dispatch.c to make sure that THREADS is defined if
   i.e. PTHREADS is defined in the makefile.

----------------------------------------------------------------------
2001-01-02 10:07:33 +00:00
Keith Whitwell
88f3b89a2c Add render stage for unclipped vb's to fx driver.
Bump MAX_TEXTURE_UNITS to 8
Fix mem. leak in destroy_lists
Fix crash in q3 (cva generally)
2000-12-28 22:11:04 +00:00
Keith Whitwell
e5d6fb20a5 try and force a log message 2000-12-28 16:42:37 +00:00
Keith Whitwell
123ff6549b try and force a log message 2000-12-28 16:35:42 +00:00
Keith Whitwell
bc28306f4a try and force a log message 2000-12-28 16:32:22 +00:00
Jon Taylor
4e96ac080a Fixed GGIMesa build problems.
Swrast triangle drawing fixes.
2000-12-28 02:00:27 +00:00
Keith Whitwell
a884b4b811 try and force a log message 2000-12-27 23:01:25 +00:00
Keith Whitwell
4292e9c06b try and force a log message 2000-12-27 22:59:46 +00:00
Keith Whitwell
20911cb17c try and force a log message 2000-12-27 22:57:13 +00:00
Keith Whitwell
1b686cedf4 try and force a log message 2000-12-27 22:55:09 +00:00
Keith Whitwell
376d022e4a fix demos/fire, enable lazy vertex flushing 2000-12-27 22:52:45 +00:00
Keith Whitwell
ae8ec0b30d Fix evalpoints bug (samples/nurb) 2000-12-27 22:30:29 +00:00
Keith Whitwell
93259cdfa1 fix sproingies bug 2000-12-27 21:49:40 +00:00
Keith Whitwell
719344b23e Fixes for compiling assembly (disable unused 'masked' versions)
Fixes for compiling without debug.
Fix line clipping
Fix unfilled polygon clipping (should be correct now).
2000-12-27 19:57:37 +00:00
Keith Whitwell
770169f230 The array cache. 2000-12-26 15:14:04 +00:00
Keith Whitwell
9ef50d5826 fix xscreensaver cores 2000-12-26 07:41:32 +00:00
Keith Whitwell
cab974cf6c Major rework of tnl module
New array_cache module
Support 8 texture units in core mesa (now support 8 everywhere)
Rework core mesa statechange operations to avoid flushing on many
noop statechanges.
2000-12-26 05:09:27 +00:00
pesco
d1ff1f6798 * demos/Makefile.am (INCLUDES): Added -I$(top_srcdir)/util.
* demos/Makefile.X11, demos/Makefile.BeOS-R4, demos/Makefile.cygnus:
Essentially the same.
Program files updated to include "readtex.c", not "../util/readtex.c".
* demos/reflect.c: Likewise for "showbuffer.c".


* Makefile.am (EXTRA_DIST): Added top-level regular files.

* include/GL/Makefile.am (INC_X11): Added glxext.h.


* src/GGI/include/ggi/mesa/Makefile.am (EXTRA_HEADERS): Include
Mesa GGI headers in dist even if HAVE_GGI is not given.

* configure.in: Look for GLUT and demo source dirs in $srcdir.

* src/swrast/Makefile.am (libMesaSwrast_la_SOURCES): Set to *.[ch].
More source list updates in various Makefile.am's.

* Makefile.am (dist-hook): Remove CVS directory from distribution.
(DIST_SUBDIRS): List all possible subdirs here.
(SUBDIRS): Only list subdirs selected for build again.
The above two applied to all subdir Makefile.am's also.
2000-12-24 22:53:54 +00:00
pesco
05ecec6f49 * include/GL/Makefile.am: ENABLE_GLUT_BUILD -> NEED_GLUT
* bootstrap: Fixed stupid mistakes.
* configure.in (LIBGL_VERSION): Include Mesa version as tiny number.
(LIBGLU_VERSION): Likewise.
2000-12-21 20:04:14 +00:00
Brian Paul
9da422c639 set visual->MRD to 2.0 2000-12-16 00:21:28 +00:00
Brian Paul
f1d6b38441 Polygon._OffsetAny wasn't being computed 2000-12-16 00:19:12 +00:00
Brian Paul
74e2dd38ed minor fog clean-ups (Klaus Niederkrueger) 2000-12-15 16:42:30 +00:00
Brian Paul
783d7dfcbf added more GLX extension function stubs 2000-12-15 04:02:50 +00:00
Brian Paul
083e466f88 Renamed texture object _P to _MaxLevel and _M to _MaxLambda.
Now add BaseLevel in _MaxLevel computation.
2000-12-14 20:25:56 +00:00
Brian Paul
daabce72db updated glXSet3DfxModeMESA() prototype types 2000-12-14 17:44:42 +00:00
Brian Paul
4536021a62 added some more GLX extension entrypoints (fix GLUT link problems when using glxext.h) 2000-12-14 17:44:08 +00:00
Brian Paul
a2003c2895 fixed conformance problems in min/max and histogram result packing 2000-12-13 23:13:45 +00:00
Brian Paul
b0dbd3ed13 replaced GLfixed with GLfloat in _mesa_fog_ci_pixels() (Klaus Niederkrueger) 2000-12-13 17:35:43 +00:00
Brian Paul
ac522d4756 use inverted Y coordinate for choosing dither value (conformance fixes) 2000-12-13 16:24:39 +00:00
Brian Paul
813882526d added glReadPixels item 2000-12-13 00:48:02 +00:00
Brian Paul
3cbbef53bc tweaked truecolor dither kernel setup code 2000-12-13 00:47:10 +00:00
Brian Paul
062bc07bde improved precision of glReadPixels for colorbuffers < 24bpp 2000-12-13 00:46:21 +00:00
Brian Paul
75639547e7 disabled two optimized textured triangle functions because of texcoord interpolation errors 2000-12-12 00:31:45 +00:00
Brian Paul
b38ad54c41 clipping, fog, texture optimizations (Klaus Niederkrueger) 2000-12-12 00:27:51 +00:00
Brian Paul
3afb7a0f70 disabled GLX_SGIS_multisample (temporarily) since its tokens aren't defined 2000-12-11 15:42:53 +00:00
Brian Paul
b04bcd14ee minor changes to fix compile problems/warnings 2000-12-11 15:41:47 +00:00
Jon Taylor
14586916b9 Added a new configure.in flag, --enable-glut-build.
This defaults to "off", so GLUT is not built by default.
2000-12-11 05:22:11 +00:00
Brian Paul
90f042ae8d generate GL_INVALID_OPERATION error for bad image format/type combinations 2000-12-10 19:23:19 +00:00
Brian Paul
8aa019d2ef _MultiTextureEnabled was being computed incorrectly 2000-12-09 22:09:50 +00:00
Brian Paul
ab6e78f3a0 adjust texture size for convolution in glCopyTex[Sub]Image[123]D() 2000-12-09 21:30:43 +00:00
Brian Paul
89c9a4cbf2 set default table size to 0, minor error check fix 2000-12-09 20:51:12 +00:00
Brian Paul
2f911cdf17 define GL_ARB_imaging 2000-12-09 20:36:18 +00:00
Brian Paul
67adba15a2 initialize convolution filters to zero 2000-12-09 20:35:54 +00:00
Brian Paul
90f8ebfd8f added queries for convolution enables 2000-12-09 20:35:32 +00:00
Brian Paul
2e5819270b added GL_RESCALE_NORMAL cases 2000-12-09 19:55:18 +00:00
Brian Paul
ec15398681 more detailed texture error messages 2000-12-08 18:09:33 +00:00
Brian Paul
23b1503d79 include glxext.h unless GLX_GLXEXT_LEGACY is defined 2000-12-08 18:08:15 +00:00
Brian Paul
fed386cdc0 standardized GLX extensions header 2000-12-08 18:06:35 +00:00
Brian Paul
536ede7e00 fixed bug 123918: glXCopySubBuffer() y position off by one 2000-12-08 17:37:00 +00:00
Brian Paul
1c6701e1e1 added LL_MESA_sprite_point extension 2000-12-08 00:28:59 +00:00
Brian Paul
cba2ca94f1 initial draft 2000-12-08 00:21:02 +00:00
Brian Paul
06d05afdd6 Initial work on GL_MESA_sprite_point extension.
Still need to resolve clipping issues, finalize the spec.
2000-12-08 00:20:15 +00:00
Brian Paul
fb7899bfec Compute attenuated point size in a new pipeline stage.
Store computed point size in the SWvertex struct.
2000-12-08 00:18:39 +00:00
Brian Paul
c1b97d91c7 minor comments, clean-up 2000-12-08 00:09:24 +00:00
Brian Paul
83886a5a7f call glFinish() before getting t1 time 2000-12-07 21:50:39 +00:00
Gareth Hughes
ab9e273c75 Allow operating system SSE support test to be overridden with an
environment variable.
2000-12-07 02:36:38 +00:00
Gareth Hughes
2ac44e2509 Merge Mesa 3.4 test for operating system support for SSE. 2000-12-06 14:41:47 +00:00
Brian Paul
fac5fd258c added -s option to control when glXSwapBuffers() is called 2000-12-02 20:33:05 +00:00
Gareth Hughes
7853901372 Enable double-buffering, count not even multiple of three. 2000-11-30 03:06:56 +00:00
Gareth Hughes
28861b192f Add basic timing information. 2000-11-30 01:44:24 +00:00
Brian Paul
7f55eb2b14 changed error tests for depth and stencil buffers 2000-11-28 22:34:46 +00:00
Brian Paul
86ca491ade fixed parameter mis-ordering bug in Driver.StencilSpan calls 2000-11-28 21:34:04 +00:00
Jouk Jansen
bfea97321c Committing in .
Modified Files:
 	Mesa/src/swrast/s_copypix.c

 changed one occurence of rgba to rgbaFloat
----------------------------------------------------------------------
2000-11-28 08:03:22 +00:00
Brian Paul
45015e4d79 Pass scale and bias values to _mesa_scale_and_bias_rgba().
Implemented post-convolution scale and bias operation.
2000-11-28 00:07:51 +00:00
Brian Paul
4304790e3e fixed a convolution pixel store bug 2000-11-28 00:04:39 +00:00
Brian Paul
6a35de3cc3 added new source directories to LIB_FILES 2000-11-27 19:13:16 +00:00
Brian Paul
72ef753d5c Set ENABLE_LIGHT according to ctx->Light.Enabled whether or not
individual light sources are enabled.
2000-11-27 18:59:09 +00:00
Brian Paul
297dfa0fbf minor changes to fix compiler warnings 2000-11-27 18:53:59 +00:00
Brian Paul
a864432fb4 Added MaxClipPlanes and MaxLights to gl_constants struct so T&L
drivers can report non-default numbers of lights and clip planes.
2000-11-27 18:22:13 +00:00
Brian Paul
50478ded80 map glIndex* functions to glIndexi() (glIndexub was looping back to glIndexub) 2000-11-27 18:17:09 +00:00
Jouk Jansen
33b2dcf0da Modified Files:
Mesa/src/tnl/t_context.c Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_pipeline.c

 Some updates to silence warnings on my VMS-machine

----------------------------------------------------------------------
2000-11-27 09:05:52 +00:00
Brian Paul
68656667b2 fixed GLX_PBUFFER value 2000-11-25 18:52:58 +00:00
Keith Whitwell
9aff6cfdc3 Fixed a couple of bugs that crept into last commit
- Eval not compiled correctly
	- Material colors computed incorrectly

Reworked the VERT_TEX flags, now support upto 12 texture units in tnl.
2000-11-24 15:21:59 +00:00
Jouk Jansen
65dcc30599 Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Updated VMS-compile support
----------------------------------------------------------------------
2000-11-24 13:55:59 +00:00
Keith Whitwell
b014986fdb New files... 2000-11-24 10:30:04 +00:00
Keith Whitwell
ad2ac216fa Support for swappable t&l modules, including an example one in the FX
driver (enable with FX_ALLOW_VTXFMT=t).
2000-11-24 10:25:05 +00:00
Brian Paul
00608a79dc minor updates for widgets-mesa/ 2000-11-23 16:36:36 +00:00
Jon Taylor
cdfba5d375 More auto* build system updates 2000-11-23 02:50:56 +00:00
Jouk Jansen
30e5ef86a0 Modified Files:
Mesa/macos/src-gli/MDD.h Mesa/macos/src-gli/mgliContext.c
 	Mesa/macos/src-gli/mgliContext.h
 	Mesa/macos/src-gli/mgliError.c Mesa/src/D3D/D3DMESA.H
 	Mesa/src/D3D/D3Dvbrender.c Mesa/src/D3D/NullProcs.c
 	Mesa/src/S3/S3mesa.c

Some more files with capitals.

----------------------------------------------------------------------
2000-11-22 09:01:04 +00:00
Jouk Jansen
dbd1e2b599 Modified Files:
Mesa/src/Allegro/amesa.c Mesa/src/DOS/dosmesa.c
 	Mesa/src/FX/fxdd.c Mesa/src/FX/fxdrv.h
 	Mesa/src/FX/fxfastpath.c
 	Mesa/src/GGI/include/ggi/mesa/ggimesa.h
 	Mesa/src/OSmesa/osmesa.c Mesa/src/SVGA/svgamesa.c
 	Mesa/src/Trace/tr_control.c Mesa/src/Windows/wgl.c
 	Mesa/src/X/xmesaP.h Mesa/src/X86/3dnow.c Mesa/src/X86/katmai.c
 	Mesa/src/X86/x86.c
 Removed Files:
 	Mesa/src/mms_depend

 Oops,... all files containing Caps in directory name or file name were
 missing in my types->mtypes commit.

----------------------------------------------------------------------
2000-11-22 08:55:51 +00:00
Jouk Jansen
22f5dc74c7 Modified Files:
Mesa/src/descrip.mms Mesa/src/swrast/s_lines.c

 VMS compile support
 Added some Type casts to avoid warnings
----------------------------------------------------------------------
2000-11-22 08:42:14 +00:00
Jouk Jansen
5e3bc0c2a2 Committing in .
Modified Files:
 	Mesa/macos/gli_api/gliapi1.h Mesa/macos/gli_api/gliapi2.h
 	Mesa/macos/gli_api/gliapiext.h Mesa/macos/src-gli/fxgli.c
 	Mesa/macos/src-gli/fxgli.h Mesa/macos/src-gli/fxgli2.c
 	Mesa/macos/src-gli/fxgli_tridebug.c Mesa/src/accum.c
 	Mesa/src/accum.h Mesa/src/all.h Mesa/src/alpha.c
 	Mesa/src/alpha.h Mesa/src/attrib.c Mesa/src/attrib.h
 	Mesa/src/bitmap.c Mesa/src/bitmap.h Mesa/src/blend.c
 	Mesa/src/blend.h Mesa/src/buffers.c Mesa/src/buffers.h
 	Mesa/src/clip.c Mesa/src/clip.h Mesa/src/colortab.h
 	Mesa/src/config.c Mesa/src/context.c Mesa/src/context.h
 	Mesa/src/convolve.c Mesa/src/convolve.h Mesa/src/copypix.c
 	Mesa/src/copypix.h Mesa/src/debug.c Mesa/src/depth.c
 	Mesa/src/depth.h Mesa/src/dlist.c Mesa/src/dlist.h
 	Mesa/src/drawpix.c Mesa/src/drawpix.h Mesa/src/enable.c
 	Mesa/src/enable.h Mesa/src/eval.c Mesa/src/eval.h
 	Mesa/src/extensions.c Mesa/src/extensions.h
 	Mesa/src/feedback.c Mesa/src/feedback.h Mesa/src/fog.c
 	Mesa/src/fog.h Mesa/src/get.c Mesa/src/get.h Mesa/src/glapi.c
 	Mesa/src/glthread.h Mesa/src/highpc.c Mesa/src/hint.h
 	Mesa/src/histogram.h Mesa/src/image.c Mesa/src/image.h
 	Mesa/src/imports.c Mesa/src/light.c Mesa/src/light.h
 	Mesa/src/lines.c Mesa/src/lines.h Mesa/src/logic.c
 	Mesa/src/logic.h Mesa/src/masking.c Mesa/src/masking.h
 	Mesa/src/matrix.c Mesa/src/matrix.h Mesa/src/pixel.c
 	Mesa/src/pixel.h Mesa/src/points.c Mesa/src/points.h
 	Mesa/src/polygon.c Mesa/src/polygon.h Mesa/src/rastpos.c
 	Mesa/src/readpix.c Mesa/src/scissor.c Mesa/src/scissor.h
 	Mesa/src/state.c Mesa/src/state.h Mesa/src/stencil.c
 	Mesa/src/stencil.h Mesa/src/teximage.c Mesa/src/teximage.h
 	Mesa/src/texobj.c Mesa/src/texobj.h Mesa/src/texstate.c
 	Mesa/src/texstate.h Mesa/src/texture.c Mesa/src/texture.h
 	Mesa/src/texutil.c Mesa/src/texutil.h Mesa/src/varray.c
 	Mesa/src/varray.h Mesa/src/X/fakeglx.c Mesa/src/X/xm_api.c
 	Mesa/src/X/xm_dd.c Mesa/src/X/xm_line.c Mesa/src/X/xm_span.c
 	Mesa/src/X/xm_tri.c Mesa/src/swrast/s_aaline.c
 	Mesa/src/swrast/s_aaline.h Mesa/src/swrast/s_aatriangle.h
 	Mesa/src/swrast/s_accum.h Mesa/src/swrast/s_alpha.h
 	Mesa/src/swrast/s_alphabuf.h Mesa/src/swrast/s_blend.h
 	Mesa/src/swrast/s_context.c Mesa/src/swrast/s_context.h
 	Mesa/src/swrast/s_depth.h Mesa/src/swrast/s_drawpix.h
 	Mesa/src/swrast/s_feedback.h Mesa/src/swrast/s_fog.h
 	Mesa/src/swrast/s_histogram.h Mesa/src/swrast/s_lines.h
 	Mesa/src/swrast/s_logic.h Mesa/src/swrast/s_masking.h
 	Mesa/src/swrast/s_pb.h Mesa/src/swrast/s_pixeltex.h
 	Mesa/src/swrast/s_points.h Mesa/src/swrast/s_quads.c
 	Mesa/src/swrast/s_quads.h Mesa/src/swrast/s_scissor.h
 	Mesa/src/swrast/s_span.h Mesa/src/swrast/s_stencil.h
 	Mesa/src/swrast/s_texture.h Mesa/src/swrast/s_triangle.h
 	Mesa/src/swrast/s_zoom.h Mesa/src/swrast/swrast.h
 	Mesa/src/swrast_setup/ss_context.h
 	Mesa/src/swrast_setup/ss_triangle.c
 	Mesa/src/swrast_setup/ss_triangle.h
 	Mesa/src/swrast_setup/ss_vb.h Mesa/src/tnl/t_clip.c
 	Mesa/src/tnl/t_clip.h Mesa/src/tnl/t_context.c
 	Mesa/src/tnl/t_context.h Mesa/src/tnl/t_cva.c
 	Mesa/src/tnl/t_cva.h Mesa/src/tnl/t_debug.c
 	Mesa/src/tnl/t_debug.h Mesa/src/tnl/t_dlist.h
 	Mesa/src/tnl/t_eval.c Mesa/src/tnl/t_eval.h
 	Mesa/src/tnl/t_fog.c Mesa/src/tnl/t_fog.h
 	Mesa/src/tnl/t_light.c Mesa/src/tnl/t_light.h
 	Mesa/src/tnl/t_pipeline.c Mesa/src/tnl/t_pipeline.h
 	Mesa/src/tnl/t_shade.c Mesa/src/tnl/t_shade.h
 	Mesa/src/tnl/t_stages.c Mesa/src/tnl/t_stages.h
 	Mesa/src/tnl/t_texture.c Mesa/src/tnl/t_texture.h
 	Mesa/src/tnl/t_trans_elt.c Mesa/src/tnl/t_trans_elt.h
 	Mesa/src/tnl/t_varray.c Mesa/src/tnl/t_varray.h
 	Mesa/src/tnl/t_vb.c Mesa/src/tnl/t_vb.h
 	Mesa/src/tnl/t_vbcull.c Mesa/src/tnl/t_vbcull.h
 	Mesa/src/tnl/t_vbfill.c Mesa/src/tnl/t_vbfill.h
 	Mesa/src/tnl/t_vbindirect.c Mesa/src/tnl/t_vbindirect.h
 	Mesa/src/tnl/t_vbrender.c Mesa/src/tnl/t_vbrender.h
 	Mesa/src/tnl/t_vbxform.c Mesa/src/tnl/t_vbxform.h
 	Mesa/src/tnl/tnl.h
 Added Files:
 	Mesa/src/mtypes.h
 Removed Files:
 	Mesa/src/types.h

 Changed Mesa/src/types to Mesa/src/mtypes.h to avoid conflicts while
compiling on a VMS system.

----------------------------------------------------------------------
2000-11-22 07:32:16 +00:00
Jon Taylor
fbe3726050 More auto* build system fixes 2000-11-22 06:49:43 +00:00
Jon Taylor
e3048be8ba swrast setup fixes 2000-11-22 06:45:38 +00:00
Brian Paul
0c000ec90c call gl_update_state() if needed in glGetColorTable, glGetConvolutionFilter 2000-11-21 23:26:13 +00:00
Brian Paul
c34cea7de5 call RENDER_START/FINISH in read_color_image() 2000-11-21 23:25:40 +00:00
Brian Paul
26d729581f minor clean-ups (Klaus Niederkrueger) 2000-11-21 23:17:36 +00:00
Brian Paul
5c0dccc896 minor clean-ups 2000-11-21 23:09:18 +00:00
Brian Paul
baf3e77ee2 added some RENDER_START/RENDER_FINISH macros. Minor GLchan changes 2000-11-21 23:01:22 +00:00
Jon Taylor
3c2e1022ed More auto* build fixes
Removed spurious trace/Makefile from repository
2000-11-21 05:17:13 +00:00
Brian Paul
189476f265 minor multi-tex changes, changed MAX_TEXTURE_UNITS to 4 2000-11-20 18:06:11 +00:00
Brian Paul
ce2733b7cc removed #include <tgmath.h> 2000-11-20 15:16:33 +00:00
Keith Whitwell
2ac294e67f fix lvalue cast on ctx->swtnl_im 2000-11-20 13:39:36 +00:00
Jon Taylor
1487b3ea3e * More work on the auto* build system
* Added missing #includes all over the place
* Added GGI-style debugging harness to GGIMesa
2000-11-19 23:42:32 +00:00
Brian Paul
a852378a62 Replaced Texture.CurrentD[] with separate Texture.Current1/2/3D vars.
Completely removed the dirty texture object list.  Set texObj->Complete
to GL_FALSE to indicate dirty.
Made point/line/triangle/quad SWvertex parameters const.
Minor code clean-ups.
2000-11-19 23:10:25 +00:00
Jon Taylor
b12d8e3b0d Added GGI-style debugging harness to GGIGLUT. 2000-11-19 07:41:26 +00:00
Gareth Hughes
54d7a74532 - Fix tnl/t_context.h inclusion.
- Some SSE asm updates, more to come.
2000-11-19 02:18:33 +00:00
Brian Paul
a13fab59ae added more programs 2000-11-18 17:13:04 +00:00
Brian Paul
ede37839ae test texture palettes with multitexture 2000-11-18 17:12:33 +00:00
Brian Paul
9b5bb5939b Mark Kilgard's reflection/shadow dino demo 2000-11-18 17:10:07 +00:00
Brian Paul
6b2eab1869 hacked demo to test multi-texture projective textures 2000-11-18 17:07:39 +00:00
Jon Taylor
912d3a04c1 * Auto* build fixes
* Added missing includes to math/*
2000-11-18 08:10:21 +00:00
Brian Paul
5a9026c65d Minor header file changes to silence warnings.
Added _mesa_enable_sw_extensions(), called by software-only drivers
to enable all s/w-supported GL extensions.
2000-11-17 21:01:25 +00:00
Jouk Jansen
9e83e8c790 Committing in .
Patches to compile Mesa on VMS.
   -Updated for new directory tree
   -Now compile with PTHREADS on


 The patch in glthread.h is temporarily. The include file src/types.h
 conflicts with the system defined types.h. In future the mesa supplied one
 should be renamed.

 Modified Files:
 	Mesa/include/GL/vms_x_fix.h Mesa/src/descrip.mms
 	Mesa/src/glthread.h Mesa/src/mms_depend
 ----------------------------------------------------------------------
2000-11-17 11:00:55 +00:00
Keith Whitwell
23caf20169 Move the transform and lighting code to two new directories
math:  Provides basic matrix and vector functionality that
               might be useful to multiple software t&l
	       implementations, and is used by core mesa to
	       manage the Model, Project, etc matrices.

	tnl:   The real transform & lighting code from core mesa,
	       including everything from glVertex3f through vertex
	       buffer handling, transformation, clipping, lighting
	       and handoff to a driver for rasterization.

The interfaces of these can be further tightened up, but the basic
splitting up of state and code move is done.
2000-11-16 21:05:34 +00:00
Jon Taylor
1795166732 Small compile fix 2000-11-16 10:38:39 +00:00
Brian Paul
0a82c75eab added includes to silence warnings 2000-11-15 16:38:59 +00:00
Brian Paul
24a32627d9 Replaced ctx->Point.Size with ctx->Point._Size
Replaced ctx->Point.UserSize with ctx->Point.Size
2000-11-15 16:38:40 +00:00
Brian Paul
30971cd098 rewrite of _mesa_win_fog_coords_from_z() so that both perspective and orthographic projection are handled correctly 2000-11-15 00:26:01 +00:00
Brian Paul
4fae0260a6 more Driver.Color, Driver.Index updates 2000-11-14 17:51:15 +00:00
Brian Paul
f930330d5f removed unused set_color() and set_index() functions 2000-11-14 17:50:07 +00:00
Brian Paul
c19d783e07 Removed Driver.Color() and Driver.Index() functions.
Pass color or color index directly to WriteMono*() span functions.
Updated current s/w drivers accordingly.
Clean-up of X gc handling in XMesa driver.
2000-11-14 17:40:13 +00:00
Keith Whitwell
1e1aac034c Cleanup of derived state calculation prior to seperating software T&L
into a new directory.  Specifically the handling of changes to lighting
lighting space (light in model vs. light in eye) have been revamped.

Moved several derived values used only by swrast into that directory.

Removed direct calls to swrast_flush() from vbrender.c -- pushed into
ctx->Driver.RenderFinish.

Optimized flat-shading case in swrast_setup.
2000-11-13 20:02:56 +00:00
Brian Paul
6b8ae62d6b removed unused var 2000-11-13 15:33:56 +00:00
Brian Paul
a2c4c98023 bumped version to 3.5 2000-11-13 15:33:17 +00:00
Brian Paul
d45fdeae35 fixed another texImage mistake in _mesa_GetTexImage() 2000-11-13 15:25:26 +00:00
Jon Taylor
dd11e7664d * Updated the autoconf/automake/libtool build system
* GGIMesa's stubs targets now uses swrast
2000-11-13 04:15:44 +00:00
Brian Paul
7351049dba init WrapR to GL_REPEAT mode 2000-11-11 20:23:47 +00:00
Brian Paul
e7f55e76db removed tr_attrib.c 2000-11-11 19:09:29 +00:00
Brian Paul
bc58b7b409 latest sources from Loki 2000-11-11 01:43:03 +00:00
Brian Paul
b5012e1ee1 replaced _NEW_IMAGING with _NEW_PIXEL 2000-11-10 18:31:04 +00:00
Brian Paul
df37d5f2db replaced s_imaging.h with s_histogram.h 2000-11-10 18:29:18 +00:00
Brian Paul
8a9507442a renamed imaging files to histogram since that's what's inside 2000-11-10 18:06:14 +00:00
Brian Paul
78bb78d1c3 renamed to histogram 2000-11-10 18:05:13 +00:00
Brian Paul
ba41b8afb1 minor changes to silence compiler warnings 2000-11-10 17:45:15 +00:00
Brian Paul
6c4268204b removed old TexImage() and TexSubImage() functions 2000-11-10 17:36:42 +00:00
Brian Paul
db6aa58267 patched to silence compiler warnings (Martin Lindhe) 2000-11-10 17:23:02 +00:00
Brian Paul
8e3366fda7 restored call to _mesa_select_tex_image() in _mesa_GetTexImage() 2000-11-10 15:32:07 +00:00
Brian Paul
3d960a0d84 GL_BGR case was misplaced in _mesa_is_legal_format_and_type() (Jeff Hartmann) 2000-11-09 23:25:06 +00:00
Brian Paul
71be653edc updated with bug fix from 3.4 branch 2000-11-09 22:41:25 +00:00
Brian Paul
5605385194 fixed mipmap setup bug 2000-11-09 16:53:26 +00:00
Keith Whitwell
14425aeca1 fixed very obvious fog bug 2000-11-07 19:17:23 +00:00
Brian Paul
7298e71360 adjust x/y/zoffset parameters to fill_texture_image() by texture border width 2000-11-07 16:40:37 +00:00
Brian Paul
2d595d7020 test ctx->RenderMode in chooser functions 2000-11-06 17:28:51 +00:00
Brian Paul
8d915cb6fb test ctx->RenderMode in chooser functions, removed dead code 2000-11-06 17:28:20 +00:00
Brian Paul
4f3e7cd3cf added a setup function for selection/feedback 2000-11-06 17:08:02 +00:00
Brian Paul
8fa6b363db added buffer test to xmesa_choose_point(), fixes X protocol error 2000-11-06 15:52:48 +00:00
Jouk Jansen
790ea3dc7f Committing in .
Modified Files:
 	Mesa/src/descrip.mms Mesa/src/mms_depend

 Updating VMS compile support

----------------------------------------------------------------------
2000-11-06 13:04:05 +00:00
Brian Paul
861ca519ab removed obsolete VB vars 2000-11-05 23:21:12 +00:00
Brian Paul
b2ad0754b0 added swrast/s_aaline.c 2000-11-05 23:19:23 +00:00
Brian Paul
0070d398d1 hooked in new AA line code, minor clean-up 2000-11-05 23:18:36 +00:00
Brian Paul
7798374e47 New implementation of antialiased lines. Mesa should now pass the remaining
GL conformance tests for AA lines (but not tried yet).
TODO: improve code sharing with the AA triangle code.
2000-11-05 23:15:16 +00:00
Keith Whitwell
14940c4ffe - Changes for new software rasterizer modules
- Remove support for choosing software fallbacks from core code
- Remove partial fallback code from vbrender.c -- drivers are now
  expected to be able to find a triangle/quad function for every state,
  even if they have to use _swsetup_Triangle or _swsetup_Quad.
- Marked derived variables in the GLcontext struct with a leading
  underscore '_'.
2000-11-05 18:40:57 +00:00
Keith Whitwell
1e885f6e6c Reworked to use the new software rasterizer. Optimized line/tri functions
are hooked into the software rasterizer.
2000-11-05 18:28:01 +00:00
Keith Whitwell
ec0585883a Use the new software rasterizer. Reworked optimized line,tri,point
functions to fit into the framework provided for extending the
software rasterizer.
2000-11-05 18:26:12 +00:00
Keith Whitwell
cd03ed4f54 Reorganized software rasterizer as a module which manages its own state,
with tighter interfaces with the rest of the world.

Proper documentation to come.
2000-11-05 18:24:40 +00:00
Keith Whitwell
7c20642b10 A new module to provide RasterSetup and advanced triangle/line/point
functionality layered on top of the software rasterizer.

An example entrypoint:
	void _swsetup_Triangle( GLcontext, GLuint, GLuint, GLuint, GLuint )

will coerce the software rasterizer to draw flat, twoside-lit,
unfilled and offset triangles (including decomposition to points or lines).
2000-11-05 18:20:18 +00:00
Keith Whitwell
c6f348cbc9 Lots of changes:
- use the new interface to the software rasterizer.
	- manage all fallbacks internally, hooking in swrast or
	  swrast_setup if necessary.
	- removed lots of marginal code no longer appropriate in a
	  maturing driver.
	- reworked the vertex-setup and triangle routines, including
	  drawing unfilled triangles from within the driver.
2000-11-05 18:16:51 +00:00
Brian Paul
a190221f70 update to GL_MESA_trace extension enums 2000-11-03 15:14:18 +00:00
Brian Paul
8e4fa8c3e6 MESA_trace extension (Loki) 2000-11-03 15:10:04 +00:00
Brian Paul
44bd53f259 added GL_MESA_packed_depth_stencil extension 2000-11-03 15:01:38 +00:00
Brian Paul
fcb23bbd6e GL_MESA_packed_depth_stencil extension spec 2000-11-03 14:58:45 +00:00
Brian Paul
75d7425061 added some missing backslashes 2000-11-03 01:37:10 +00:00
Gareth Hughes
5f5632c424 Change transformation from ortho to perspective so we get the MGA elt
path by default.
2000-11-03 00:09:31 +00:00
Brian Paul
861eb8eb16 update for separate libOSMesa.so lib 2000-11-01 16:02:52 +00:00
Brian Paul
563d26b247 print number of texture units 2000-11-01 16:02:01 +00:00
Jouk Jansen
b35ec1ca05 Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Updated Makefiles for VMS
----------------------------------------------------------------------
2000-11-01 15:53:02 +00:00
Gareth Hughes
9f568e512f Added trivial CVA test for testing HW driver fastpaths, good for testing
indexed vertex buffer implementations for instance.

Cleaned up Makefile to make building and adding more tests easier.
2000-11-01 03:14:12 +00:00
Brian Paul
acdb6db846 Always call Driver.SetReadBuffer() in copy pixels functions, just to be safe 2000-10-31 23:11:06 +00:00
Brian Paul
fda3b1a4b1 added comment explaining why the demo is flawed 2000-10-31 20:41:06 +00:00
Keith Whitwell
724abeb058 Moved the software rasterizer to a new directory. 2000-10-31 18:09:44 +00:00
Keith Whitwell
e3a051e053 Moved software rasterizer functionality to new directory. 2000-10-31 18:00:04 +00:00
Keith Whitwell
6e0f0f51e0 Remove dead code in FX driver. 2000-10-31 12:40:57 +00:00
Brian Paul
039bf534aa removed debug printf 2000-10-31 01:20:06 +00:00
Brian Paul
efeddebe81 big overhaul of the demo, works better now 2000-10-30 22:38:55 +00:00
Keith Whitwell
365dc68c39 Rearrange VERT_* flags to support 4 texture units. 2000-10-30 18:50:42 +00:00
Brian Paul
9499e017b7 Removed UPDATE_IMAGE_TRANSFER_STATE, use _NEW_PIXEL flag instead.
More minor GLchan changes.
Silence some compiler warnings in cva.[ch]
2000-10-30 16:32:42 +00:00
Keith Whitwell
caef4a35d6 Removed references to gcc's __FUNCTION__ macro.
Removed dead file fog_tmp.h
2000-10-30 16:30:56 +00:00
Brian Paul
6ad2c5b59a set *t->flag = enabled in gl_extensions_add(), otherwise, extension booleans weren't set 2000-10-30 16:27:21 +00:00
Keith Whitwell
69676ac379 test cvs commit logging 2000-10-30 16:00:42 +00:00
Keith Whitwell
a96308c37d Replace the flags Mesa was using for ctx->NewState with a new set
based on the GL attribute groups.

Introduced constants describing the circumstances under which some
key derived values can change:
	_SWRAST_NEW_RASTERMASK -- ctx->RasterMask
	_SWRAST_NEW_TRIANGLE   -- The software rasterizer's triangle
	                          function
	_DD_NEW_FEEDBACK -- the 'DD_FEEDBACK' bit in ctx->TriangleCaps

These are helpful in deciding whether you need to recalculate state if your
recalculation involves reference to a derived value.
2000-10-30 13:31:59 +00:00
Jouk Jansen
a457549967 Committing in .
Modified Files:
 	Mesa/src/X/xm_api.c

 included macros.h

----------------------------------------------------------------------
2000-10-30 08:39:38 +00:00
Brian Paul
193005393d renamed Current.ByteColor Current.Color 2000-10-29 19:02:23 +00:00
Brian Paul
ebb248aa5c more minor header file re-org (moved CONST, ASSERT, INLINE to config.h) 2000-10-29 18:23:16 +00:00
Brian Paul
699bc7b73d More GLchan color channel changes.
Some header file re-org:
   Move matrix, vertex buffer structs to types.h to fix #include mess.
   Remove typedef, extern declarations from config.h
2000-10-29 18:12:14 +00:00
Brian Paul
c893a015d8 New colormac.h file for color-related macros.
Lot's of clean-up in macros.h and mmath.h
2000-10-28 20:41:13 +00:00
Brian Paul
ba643a2094 Basic work to support deep color channels:
Replace GLubyte with GLchan
  Replace 255 with CHAN_MAX
2000-10-28 18:34:48 +00:00
Keith Whitwell
a897b335be Do per-pixel fog when GL_FOG_HINT is GL_NICEST.
Fix scaling bug in per-pixel fog calculations.
2000-10-28 11:42:12 +00:00
Jon Taylor
1aa958bc9c Lots of misc. bugfixes to bring GGIMesa in sync with the latest Mesa sources. 2000-10-28 10:02:44 +00:00
Brian Paul
1c4b3f4dfb restored test for __alpha in _mesa_win_fog_coords_from_z() 2000-10-27 18:38:35 +00:00
Brian Paul
7dd57a48e1 added info about GL_EXT_secondary_color and GL_EXT_fog_coord 2000-10-27 18:32:55 +00:00
Brian Paul
a14cbff8e5 Enabled GL_EXT_secondary_color. Fixed a bunch of typos in the dlist.c
and state.c file for plugging those functions into the dispatch table.
Don't use Mesa 3.5 for DRI until SGI approves the new dispatch offsets.
Commented-out references to ctx->FogMode and VB->Specular in FX driver.
Minor clean-up in extensions.c
Removed unused prototype in fog.h
2000-10-27 18:31:21 +00:00
Keith Whitwell
fe5d67d95f Implement EXT_fog_coord and EXT_secondary_color.
EXT_secondary_color is disabled until we get some dispatch offsets from SGI.
2000-10-27 16:44:40 +00:00
Gareth Hughes
ba58a6665f Change animated apps to double-buffered visuals by default. 2000-10-27 02:49:17 +00:00
Brian Paul
b4df56fcd9 added GL_BGR case to bytes_per_pixel() 2000-10-26 21:48:18 +00:00
Brian Paul
7460cfabbc removed X86/*.m4 files from tar archive 2000-10-26 19:36:14 +00:00
Brian Paul
66202b75d5 clarified meaning of DEFAULT_SOFTWARE_DEPTH_BITS value 2000-10-26 19:26:18 +00:00
Brian Paul
7ceffd0e0d fixed value for GLU_NURBS_MODE 2000-10-26 15:32:54 +00:00
Brian Paul
27a26bfc4b added a glFinish() call 2000-10-26 15:26:14 +00:00
Brian Paul
21d073d55a added incomplete() debug function/macro 2000-10-24 02:53:18 +00:00
Brian Paul
9a4a958a5c signal NEW_TEXTURING if there's a Driver.BindTexture() function 2000-10-24 01:13:58 +00:00
Brian Paul
6cdf09749c Put a white texel in each corner of each texture.
Draw polygons using the texture's aspect ratio.
The tdfx-3-0-0 texcoord bug is obvious with the -randomsize option.
2000-10-23 23:32:22 +00:00
Brian Paul
0448488e11 added idle() func, enable fog by default 2000-10-23 20:06:36 +00:00
Brian Paul
5a501fbd09 added libOSMesa.so info 2000-10-23 19:46:11 +00:00
Brian Paul
5bb27edac0 generate separate libOSMesa library ala XFree86/DRI 2000-10-23 19:43:36 +00:00
Brian Paul
edda9ae9fb fixed 386/x86 mismatches, reordered a few configs 2000-10-23 19:33:55 +00:00
Gareth Hughes
ac018f5494 Major audit of all Mesa's x86 assembly code. This round is basically
general cleanups - more to come.

Added P6 architecture timing to debug_xform routines.  Still need to add
test_all_vertex_functions test for the v16 asm.  Dynamic reconfiguration
of counter overhead for more accurate benchmarking.

Removed redundant x86 assembly build options, replace with linux-x86 and
so on.  This will build all x86, MMX, 3DNow!, SSE etc assembly into
libGL - preferred over many different options to include some but not
all assembly code.  Note that linux-3dnow and linux-katmai options have
thus been removed.
2000-10-23 00:20:50 +00:00
Gareth Hughes
fc2427e81b Major audit of all Mesa's x86 assembly code. This round is basically
general cleanups - more to come.

Added P6 architecture timing to debug_xform routines.  Still need to add
test_all_vertex_functions test for the v16 asm.  Dynamic reconfiguration
of counter overhead for more accurate benchmarking.
2000-10-23 00:16:28 +00:00
Brian Paul
e188b6e1f1 added a proper idle() function 2000-10-21 04:29:02 +00:00
Brian Paul
eb326f5f01 fixed a texture enable bug 2000-10-21 01:29:12 +00:00
Brian Paul
d0d7d62120 polygon offset changes; added Visual->MRD field 2000-10-21 00:02:47 +00:00
Brian Paul
d475730357 Changes for multitexture > 3, code clean-ups.
Added GLboolean ctx->Texture.MultiTextureEnabled to determine when
multitexture is enabled.  Eventually ctx->Texture.ReallyEnabled may
become a boolean.
2000-10-20 19:54:49 +00:00
Brian Paul
a2d2aed64a use 1.1 glPolygonOffset instead of glPolygonOffsetEXT 2000-10-20 17:26:57 +00:00
Brian Paul
9c7ca850fd Rewrote get_static_proc_address(). It made mistakes in some situations 2000-10-19 20:13:12 +00:00
Brian Paul
a5b66333fb glPixelStore(GL_PACK/UNPACK_SKIP_IMAGES) wasn't handled correctly 2000-10-19 20:09:47 +00:00
Brian Paul
9f0bb59c53 call Driver.SetReadBuffer() in clear_color_buffers() to fix colormasked clear bug 2000-10-19 18:17:19 +00:00
Brian Paul
cc50ed60b3 improved blending accuracy to fix Glean test failures 2000-10-19 18:08:05 +00:00
Brian Paul
6aafd2491c GL_MAX_TEXTURE_UNITS_ARB is now 3 2000-10-18 15:14:48 +00:00
Brian Paul
ce938b307e More fixes for MAX_TEXTURE_UNITS > 2. Seems to work now.
Misc code clean-ups, minor bug fixes.
MAX_TEXTURE_UNITS now defaults to 3.
2000-10-18 15:02:59 +00:00
Brian Paul
d367216678 ported render begin/end calls from Mesa 3.4 2000-10-17 00:42:02 +00:00
Brian Paul
1873b567b2 added _mesa_get_teximages_from_driver() 2000-10-16 23:43:12 +00:00
Brian Paul
1100b4daa3 use gray background, memset TempImage to white to help with debugging 2000-10-16 21:24:39 +00:00
Brian Paul
35324a6c60 if depthBits == 0, set DepthMask = 2^16 to fix per-fragment fog problems 2000-10-09 22:42:40 +00:00
Brian Paul
1791901468 update TriangleCaps in GL_POINT/POLYGON_SMOOTH cases 2000-10-05 23:10:42 +00:00
Brian Paul
fdf2033bda brighter colors 2000-10-05 21:57:00 +00:00
Brian Paul
2c7e6334ec better handling of GLX_DEPTH_SIZE in glXChooseVisual() 2000-10-05 17:38:21 +00:00
Brian Paul
fa849a0e16 drawing color-index image to RGB window was broken 2000-10-05 16:22:22 +00:00
Jouk Jansen
55590ee810 Committing in .
Modified Files:
 	Mesa/demos/paltex.c

 Silenced compiler warnings

----------------------------------------------------------------------
2000-10-05 07:17:43 +00:00
Brian Paul
476609c539 improved to test alpha blending with texture palette 2000-10-04 18:15:39 +00:00
Brian Paul
16eb23a0cb more work to support N texture units 2000-10-02 15:45:12 +00:00
Brian Paul
22f1ca0131 textured line test 2000-09-30 18:48:33 +00:00
Brian Paul
9c05c0494d support for N texture units 2000-09-30 18:42:29 +00:00
Brian Paul
4f66498304 added fps output 2000-09-29 23:09:39 +00:00
Brian Paul
e92dd16605 generalized support for N texure units 2000-09-29 16:58:44 +00:00
Brian Paul
eb6c6439ae removed ctx->Texture.Enabled, use ctx->Texture.ReallyEnabled instead 2000-09-28 22:44:30 +00:00
Brian Paul
37a6211795 new params for SpecificCompressedTexFormat() (Bill White) 2000-09-28 18:30:39 +00:00
Jouk Jansen
574c456a5a Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 inserted imports.c
----------------------------------------------------------------------
2000-09-27 10:59:15 +00:00
Brian Paul
f142a0830a include types.h 2000-09-27 03:30:49 +00:00
Brian Paul
643be95416 renamed gl_copy_context to _mesa_copy_context 2000-09-26 21:28:39 +00:00
Brian Paul
6542324cb0 added imports.c 2000-09-26 21:22:20 +00:00
Brian Paul
b1394fa92a First batch of OpenGL SI related changes:
Renamed struct gl_context to struct __GLcontextRec.
Include glcore.h, setup GL imports/exports.
Replaced gl_ prefix with _mesa_ prefix in context.[ch] functions.
GLcontext's Visual field is no longer a pointer.
2000-09-26 20:53:53 +00:00
Brian Paul
3b18a36f21 Replaced preprocessor symbol GL_MESA_TRACE with MESA_TRACE.
Changed src/Makefile.X11 to compile Trace sources like other drivers.
2000-09-26 15:27:20 +00:00
Brian Paul
63c113a31b use GL_NEAREST texture filter 2000-09-26 15:25:01 +00:00
Brian Paul
423f2b2884 added GL_ARB_texture_env_add 2000-09-25 16:03:59 +00:00
Brian Paul
b9b329d1e5 removed unused display_list struct 2000-09-24 16:11:55 +00:00
Gareth Hughes
5e0bb98abd Added SSE streaming store instructions, external symbol directives. 2000-09-18 22:49:04 +00:00
Gareth Hughes
5aa1c1cd5f Added SSE prefetching instructions. General cleanups. 2000-09-18 16:57:16 +00:00
Brian Paul
1c56fdc707 new comments, misc clean-up 2000-09-17 21:56:07 +00:00
Gareth Hughes
f3c399ec11 General cleanups. Disable gl_katmai_project_vertices and
gl_katmai_project_clipped_vertices for now as they are broken.
2000-09-17 21:12:40 +00:00
Brian Paul
345a71a9cb set default window pos, changed 4 to GL_RGBA 2000-09-15 23:59:46 +00:00
Brian Paul
4ed1d0b2c0 added some missing const keywords in GetString 2000-09-15 19:57:51 +00:00
Brian Paul
1ff933b452 added GL_MESA_trace support 2000-09-15 19:45:40 +00:00
Brian Paul
98b3dd40f7 Added GL_MESA_trace extension (Loki) 2000-09-15 19:45:00 +00:00
Brian Paul
771b975528 added trace support (Loki) 2000-09-15 19:44:39 +00:00
Brian Paul
4360bd7c76 removed unused struct display_list_compilation 2000-09-15 17:04:35 +00:00
Brian Paul
cefc42f1ba added FPS calculation 2000-09-15 16:43:57 +00:00
Brian Paul
008e4e7e39 added more warning options to linux-elf-debug config 2000-09-15 15:55:24 +00:00
Brian Paul
0e52184c48 moved DECLARE_XFORM_GROUP macros outside of gl_init_3dnow_asm_transforms() to silence compiler warnings 2000-09-15 15:54:25 +00:00
Brian Paul
f7a4bcaf79 use cpml.h on Alpha (AlanH) 2000-09-15 15:42:45 +00:00
Brian Paul
64a23a0f9c updated comments 2000-09-14 23:13:51 +00:00
Brian Paul
23316033db explicitly init some texture vars 2000-09-14 23:13:23 +00:00
Brian Paul
ae18872bc7 added cursor key info to instructions 2000-09-13 23:01:52 +00:00
Brian Paul
a94ee16534 replaced GL_RGBA with GL_BGRA for GL_UNSIGNED_SHORT_1_5_5_5_REV datatype 2000-09-13 22:07:20 +00:00
Brian Paul
881ec9ee67 packing of GLushort packed types was broken 2000-09-12 21:10:25 +00:00
Brian Paul
8d4bd87c1a added format/type error check to draw_rgba_pixels() 2000-09-12 21:09:24 +00:00
Brian Paul
e4b684ce49 init mutex 2000-09-12 21:07:40 +00:00
Brian Paul
d49b34a233 better FPS calculation 2000-09-12 18:44:45 +00:00
Brian Paul
b8cc150836 terrain demo data 2000-09-12 17:58:27 +00:00
Brian Paul
4df1f7c7ba better fps computation 2000-09-12 17:38:22 +00:00
Brian Paul
82cfcfa63a added some casts (Takaaki Nomura) 2000-09-12 17:03:59 +00:00
Brian Paul
b9466fca3e Win32 updates (Chris Morley) 2000-09-12 15:46:43 +00:00
Brian Paul
8f39dd1e62 Win32 update (Chris Morley) 2000-09-12 15:41:46 +00:00
Brian Paul
038573aae7 Removed immediate struct's maybe_transform_vb pointer.
Call _mesa_maybe_transform_vb() directly.
2000-09-11 18:49:06 +00:00
Jouk Jansen
b506d8753d Committing in .
Modified Files:
 	Mesa/src/descrip.mms

 Corrected a typo
----------------------------------------------------------------------
2000-09-09 07:05:32 +00:00
Brian Paul
9a2da667f3 added Dither, NEW_DRVSTATE info 2000-09-08 22:39:09 +00:00
Brian Paul
399ae35ac6 removed unused NEW_DRVSTATE flags 2000-09-08 22:07:29 +00:00
Brian Paul
9d3e5db9fc added dither key option 2000-09-08 21:45:21 +00:00
Brian Paul
7f7b205259 removed ctx->Driver.Dither function 2000-09-08 21:44:55 +00:00
Brian Paul
48c6a6ecd2 changed gl_frame_buffer Xmax and Ymax to be exclusive boundary values 2000-09-08 21:28:04 +00:00
Brian Paul
e18e0e98fe added OSMesaCreateContextExt item 2000-09-08 16:42:44 +00:00
Brian Paul
46dbaec56a Use OSMesaCreateContextExt() if using Mesa 3.5 or later 2000-09-08 16:42:06 +00:00
Brian Paul
2bf5d9470d added OSMesaCreateContextExt() 2000-09-08 16:41:38 +00:00
Brian Paul
8ad306baf6 added device driver changes 2000-09-07 15:46:05 +00:00
Brian Paul
c4c639c9a4 Removed ctx->Driver.LogicOp().
ctx->Driver.Index/ColorMask() now return void.
Removed SWmasking and SWLogicOpEnabled variables.
LogicOps and color/index masking are no longer special-case device
driver functions.  The Xlib driver was the only driver that used
them.  Things are more uniform now.
2000-09-07 15:45:26 +00:00
Brian Paul
18f73b622f added xmesa_update_span_funcs() 2000-09-07 15:42:38 +00:00
Brian Paul
16c3ea9459 renamed Xlib driver files 2000-09-07 15:42:13 +00:00
Brian Paul
693f81be4c newly organized Xlib driver files 2000-09-07 15:40:30 +00:00
Brian Paul
38d3f3d660 added device driver function for texture proxy testing 2000-09-07 15:38:49 +00:00
Brian Paul
724f2939f4 silence compiler warning (zoomY0) 2000-09-06 17:44:52 +00:00
Brian Paul
afa61173a8 test for __bsdi__ for XFree86 2000-09-06 17:34:41 +00:00
Brian Paul
37cfb3b5c2 replaced ## with CONCAT macro 2000-09-06 17:33:40 +00:00
Brian Paul
f96ce6a707 oops- forgot convolution for glGetTexImage. Done now. 2000-09-06 15:15:43 +00:00
Brian Paul
c52fc9b49c passing proxy targets to glGetTexImage() should generate GL_INVALID_ENUM 2000-09-05 22:11:38 +00:00
Brian Paul
9c27278acf use clear_proxy_teximage() instead of MEMSET() 2000-09-05 22:04:30 +00:00
Brian Paul
f75d697c03 GetConvolution/SeparableFilter() now finished 2000-09-05 20:28:56 +00:00
Brian Paul
45f3634ce3 added tracing facility from Loki 2000-09-05 20:28:06 +00:00
Brian Paul
3a71d05e53 added tracing facility from Loki 2000-09-05 20:17:37 +00:00
Brian Paul
dca39e8911 added const to _mesa_select_tex_object() 2000-09-05 15:41:25 +00:00
Brian Paul
01e54753ff Fixed bug in fill_texture_image(). Clean-up in _mesaGetTexImage() 2000-09-05 15:40:34 +00:00
Brian Paul
bc6f07856f added convolution, ARB_imaging items 2000-09-02 17:54:28 +00:00
Brian Paul
513d486e75 enabled GL_EXT_convolution and GL_ARB_imaging 2000-09-02 17:52:53 +00:00
Brian Paul
a805bb9691 finished convolution 2000-09-02 17:52:21 +00:00
Brian Paul
bfc6ee1b13 destBytesPerRow was uninitialized in make_texture_image() 2000-09-01 22:01:12 +00:00
Brian Paul
e8a84a93aa initial check-in 2000-09-01 21:01:18 +00:00
Brian Paul
bed573586e added new extensions 2000-08-31 23:04:17 +00:00
Brian Paul
328cb0b512 added Glide3 bug fix info 2000-08-31 23:04:03 +00:00
Brian Paul
b3fdfa1246 fbiRev and tmuRev weren't getting initialized when using Glide3 2000-08-31 22:32:45 +00:00
Brian Paul
15915b03d0 added more resolutions (Andy Sloane) 2000-08-31 22:08:04 +00:00
Brian Paul
5a0d3dc7b3 convolution for glTexImage[123]D now works 2000-08-31 15:24:39 +00:00
Brian Paul
b92d64e150 renamed some variables 2000-08-31 15:24:07 +00:00
Brian Paul
f93b3dd69e more convolution work 2000-08-30 18:22:28 +00:00
Brian Paul
116970154d added _mesa_pack_float_rgba_span() 2000-08-30 18:21:37 +00:00
Brian Paul
8e053916c8 added more extensions testing code 2000-08-30 18:21:06 +00:00
Brian Paul
289d47eee5 finished compressed texture support (Bill White) 2000-08-29 23:31:23 +00:00
Brian Paul
148fb313c5 added MESA_FF_R8_G8_B8 (alpha filled to 0xff) format 2000-08-29 23:30:53 +00:00
Brian Paul
e8e20ae598 changed default Shininess to 6 2000-08-29 21:17:38 +00:00
Brian Paul
8aee2a3326 don't free ctx inside _mesa_initialize_context() if error, caller does that. 2000-08-29 18:57:58 +00:00
Brian Paul
ef9025a641 updated some comments 2000-08-29 14:25:30 +00:00
Jouk Jansen
5d3a95714c Committing in .
Modified Files:
 	Mesa/demos/descrip.mms

 One forgotten file for VMS to support /name=(as_is,short)

----------------------------------------------------------------------
2000-08-24 08:48:27 +00:00
Brian Paul
cf8eebee07 added convolve.h header 2000-08-23 14:33:04 +00:00
Brian Paul
732dd6f417 enabling 1D convolution caused a problem 2000-08-23 14:32:06 +00:00
Brian Paul
147b08328a moved convolution API functions to convolve.c 2000-08-23 14:31:25 +00:00
Brian Paul
7e70874420 finished separable filter functions 2000-08-22 18:54:25 +00:00
Jouk Jansen
b5b5c52034 Committing in .
Modified Files:
 	Mesa/include/GL/glx.h Mesa/include/GL/xmesa.h
 	Mesa/src/descrip.mms Mesa/src/X/glxheader.h
 	Mesa/src/X/xfonts.c Mesa/src/X/xfonts.h
 	Mesa/src-glu/descrip.mms Mesa/src-glut/capturexfont.c
 	Mesa/src-glut/descrip.mms Mesa/src-glut/glut_cmap.c
 	Mesa/src-glut/glut_event.c Mesa/src-glut/glut_fullscrn.c
 	Mesa/src-glut/glut_gamemode.c Mesa/src-glut/glut_init.c
 	Mesa/src-glut/glut_input.c Mesa/src-glut/glut_menu.c
 	Mesa/src-glut/glut_menu2.c Mesa/src-glut/glut_overlay.c
 	Mesa/src-glut/glut_win.c Mesa/src-glut/glut_winmisc.c
 	Mesa/src-glut/glutint.h Mesa/src-glut/layerutil.h
 	Mesa/vms/analyze_map.com
 Added Files:
 	Mesa/include/GL/vms_x_fix.h

 Patches effective on VMS only. This allows for compiling with
 /name=(as_is,short). This breaks the binary compatibility with previous
 versions for VMS, but is the only way to combine Mesa with GTK for VMS.


                      Jouk
----------------------------------------------------------------------
2000-08-22 13:31:00 +00:00
Brian Paul
f4f4dab25a changed quad vertex colors to be tessellation invariant 2000-08-21 21:05:39 +00:00
Brian Paul
043654bbfb print UNDEFINED MODE over samples that are undefined in the GL spec 2000-08-21 20:04:55 +00:00
Brian Paul
9b61162d43 use ImageTransferState 2000-08-21 14:26:01 +00:00
Brian Paul
3f8a70e5dd added convolve.c to file list 2000-08-21 14:25:25 +00:00
Brian Paul
a6d46f6b99 increased max convolution filter size 2000-08-21 14:24:53 +00:00
Brian Paul
d4b799b60c more convolution work, not done 2000-08-21 14:24:30 +00:00
Brian Paul
46e8a51383 basic glDrawPixels convolution implemented 2000-08-21 14:24:10 +00:00
Brian Paul
6339e621f5 fixed image transfer errors 2000-08-21 14:23:09 +00:00
Brian Paul
fa4525e289 implemented new ImageTransferState bitmask 2000-08-21 14:22:24 +00:00
Brian Paul
b1097f24a8 optimized glDrawPixels for glPixelZoom(1,-1) (Andrew Gee) 2000-08-16 20:51:53 +00:00
Brian Paul
e716184cae added missing radius multiplication factor to sphere code 2000-08-16 20:36:34 +00:00
Brian Paul
6f0294ca47 fixed typo which disabled simple_DrawPixels 2000-08-16 17:32:42 +00:00
Brian Paul
e98276c859 fixed some warnings (Alan H.) 2000-08-16 17:26:06 +00:00
Brian Paul
dff7924e25 removed all dependencies on XMesa 2000-08-13 03:57:21 +00:00
Brian Paul
094e2f1a67 fixed segfault problem when using MESA_GLX_FX 2000-08-13 03:44:08 +00:00
Brian Paul
7aac6d6b8e fixed depth mask bug in fxddClear(DD_DEPTH_BIT) 2000-08-09 17:56:27 +00:00
Jouk Jansen
8deec7bf5f Committing in .
Modified Files:
 	Mesa/src-glu/descrip.mms

 Update VMS-makefile for "old" GLU
----------------------------------------------------------------------
2000-08-09 06:24:55 +00:00
Brian Paul
963946d3d7 updated version to 3.5 2000-08-08 16:20:32 +00:00
Brian Paul
d4f6695a3e bumped MESA_MINOR to 5 2000-08-08 16:16:22 +00:00
Brian Paul
042066887b added GetInteger/Float/Double/Boolean/Pointer device driver functions 2000-08-08 16:15:14 +00:00
Brian Paul
507d83e4cc added NULL parameter checking to API functions 2000-08-03 14:03:17 +00:00
Brian Paul
ddf69f247f updated Phil's email address 2000-08-02 20:35:09 +00:00
Brian Paul
585d191ae7 updates from mesa3d@billbaxter.com 2000-08-02 20:29:03 +00:00
Brian Paul
bd0f7f42d6 fixed return val bug in glAreTexturesResident() 2000-08-02 20:16:03 +00:00
Brian Paul
6f173cafbd added include/GL/mesa_wgl.h to tar file list 2000-08-02 20:14:23 +00:00
Brian Paul
b8d907a9bb updated by Alessandro Pisani 2000-08-02 20:09:09 +00:00
Brian Paul
ee2ef90b7f test handling of lots of textures 2000-08-02 17:57:56 +00:00
Brian Paul
769439a23d removed GLU 1.2 symbols 2000-08-02 14:08:48 +00:00
Brian Paul
00277e836d define GL_GLEXT_PROTOTYPES before including mesa_wgl.h 2000-08-02 00:41:21 +00:00
Brian Paul
6d04725282 initialize texture priorities to 1.0, clean-up of _mesa_PrioritizeTextures() 2000-08-02 00:38:25 +00:00
Brian Paul
390488d12e glGetTexParameter(GL_TEXTURE_RESIDENT) didn't query device driver 2000-08-01 17:33:53 +00:00
Brian Paul
85dc4e7a77 test against an epsilon magnitude in gl_rotation_matrix() 2000-07-31 15:31:29 +00:00
Brian Paul
974e468e6d install glext.h too 2000-07-31 15:27:11 +00:00
Brian Paul
6998c71458 added missing widgets-mesa/src/*.c files, updated version numbers to 3.5 2000-07-31 13:59:22 +00:00
Brian Paul
5c8de84f5f 3.5 release notes 2000-07-31 13:58:04 +00:00
Brian Paul
1357249aa9 added placeholders for 3.4 and 3.5 info 2000-07-31 13:57:40 +00:00
2818 changed files with 976434 additions and 102551 deletions

8
.gitignore vendored Normal file
View File

@@ -0,0 +1,8 @@
*~
*.a
*.o
*.so
depend
depend.bak
lib
lib64

File diff suppressed because it is too large Load Diff

487
Makefile Normal file
View File

@@ -0,0 +1,487 @@
# Top-level Mesa makefile
TOP = .
SUBDIRS = src progs
default: $(TOP)/configs/current
@for dir in $(SUBDIRS) ; do \
(cd $$dir ; $(MAKE)) || exit 1 ; \
done
doxygen:
(cd doxygen ; make) ; \
clean:
@for dir in $(SUBDIRS) ; do \
(cd $$dir ; $(MAKE) clean) ; \
done
realclean:
touch $(TOP)/configs/current
$(MAKE) clean
-rm -rf lib*
-rm -f $(TOP)/configs/current
-rm -f `find . -name \*.o`
-rm -f `find . -name \*.a`
-rm -f `find . -name \*.so`
-rm -f `find . -name depend`
install:
@for dir in $(SUBDIRS) ; do \
(cd $$dir ; $(MAKE) install) || exit 1 ; \
done
# DirectFBGL module installation
linux-directfb-install:
cd src/mesa/drivers/directfb && $(MAKE) install
# If there's no current configuration file
$(TOP)/configs/current:
@echo
@echo
@echo "Please choose a configuration from the following list:"
@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
@echo
@echo "Then type 'make <config>' (ex: 'make linux-x86')"
@echo "(ignore the following error message)"
@exit 1
# Rules to set/install a specific build configuration
aix \
aix-64 \
aix-64-static \
aix-gcc \
aix-static \
beos \
darwin \
darwin-static \
darwin-static-x86ppc \
darwin-x86ppc \
freebsd \
freebsd-dri \
freebsd-dri-amd64 \
freebsd-dri-x86 \
hpux10 \
hpux10-gcc \
hpux10-static \
hpux11-32 \
hpux11-32-static \
hpux11-32-static-nothreads \
hpux11-64 \
hpux11-64-static \
hpux11-ia64 \
hpux11-ia64-static \
hpux9 \
hpux9-gcc \
irix6-64 \
irix6-64-static \
irix6-n32 \
irix6-n32-static \
irix6-o32 \
irix6-o32-static \
linux \
linux-alpha \
linux-alpha-static \
linux-debug \
linux-directfb \
linux-dri \
linux-dri-debug \
linux-dri-x86 \
linux-dri-x86-64 \
linux-dri-ppc \
linux-dri-xcb \
linux-indirect \
linux-fbdev \
linux-glide \
linux-ia64-icc \
linux-ia64-icc-static \
linux-icc \
linux-icc-static \
linux-osmesa \
linux-osmesa16 \
linux-osmesa16-static \
linux-osmesa32 \
linux-ppc \
linux-ppc-static \
linux-solo \
linux-solo-x86 \
linux-solo-ia64 \
linux-sparc \
linux-sparc5 \
linux-static \
linux-ultrasparc \
linux-tcc \
linux-x86 \
linux-x86-debug \
linux-x86-32 \
linux-x86-64 \
linux-x86-64-debug \
linux-x86-64-static \
linux-x86-glide \
linux-x86-static \
netbsd \
openbsd \
osf1 \
osf1-static \
solaris-x86 \
solaris-x86-gcc \
solaris-x86-gcc-static \
sunos4 \
sunos4-gcc \
sunos4-static \
sunos5 \
sunos5-gcc \
sunos5-64-gcc \
sunos5-smp \
sunos5-v8 \
sunos5-v8-static \
sunos5-v9 \
sunos5-v9-static \
ultrix-gcc:
@ if [ -e configs/current ] ; then \
echo "Please run 'make realclean' before changing configs" ; \
exit 1 ; \
fi
(cd configs && rm -f current && ln -s $@ current)
$(MAKE) default
# Rules for making release tarballs
DIRECTORY = Mesa-6.5.2
LIB_NAME = MesaLib-6.5.2
DEMO_NAME = MesaDemos-6.5.2
GLUT_NAME = MesaGLUT-6.5.2
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/descrip.mms \
$(DIRECTORY)/mms-config. \
$(DIRECTORY)/bin/mklib \
$(DIRECTORY)/bin/minstall \
$(DIRECTORY)/configs/[a-z]* \
$(DIRECTORY)/docs/*.html \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/include/GL/internal/glcore.h \
$(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/dmesa.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glx.h \
$(DIRECTORY)/include/GL/glxext.h \
$(DIRECTORY)/include/GL/glx_mangle.h \
$(DIRECTORY)/include/GL/glfbdev.h \
$(DIRECTORY)/include/GL/mesa_wgl.h \
$(DIRECTORY)/include/GL/mglmesa.h \
$(DIRECTORY)/include/GL/osmesa.h \
$(DIRECTORY)/include/GL/svgamesa.h \
$(DIRECTORY)/include/GL/ugl*.h \
$(DIRECTORY)/include/GL/vms_x_fix.h \
$(DIRECTORY)/include/GL/wmesa.h \
$(DIRECTORY)/include/GL/xmesa.h \
$(DIRECTORY)/include/GL/xmesa_x.h \
$(DIRECTORY)/include/GL/xmesa_xf86.h \
$(DIRECTORY)/include/GLView.h \
$(DIRECTORY)/src/Makefile \
$(DIRECTORY)/src/descrip.mms \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/sources \
$(DIRECTORY)/src/mesa/descrip.mms \
$(DIRECTORY)/src/mesa/depend \
$(DIRECTORY)/src/mesa/main/*.[chS] \
$(DIRECTORY)/src/mesa/main/descrip.mms \
$(DIRECTORY)/src/mesa/main/sources \
$(DIRECTORY)/src/mesa/glapi/*.[chS] \
$(DIRECTORY)/src/mesa/glapi/descrip.mms \
$(DIRECTORY)/src/mesa/glapi/sources \
$(DIRECTORY)/src/mesa/array_cache/*.[ch] \
$(DIRECTORY)/src/mesa/array_cache/descrip.mms \
$(DIRECTORY)/src/mesa/array_cache/sources \
$(DIRECTORY)/src/mesa/math/*.[ch] \
$(DIRECTORY)/src/mesa/math/descrip.mms \
$(DIRECTORY)/src/mesa/math/sources \
$(DIRECTORY)/src/mesa/shader/*.[ch] \
$(DIRECTORY)/src/mesa/shader/descrip.mms \
$(DIRECTORY)/src/mesa/shader/sources \
$(DIRECTORY)/src/mesa/shader/grammar/*.[ch] \
$(DIRECTORY)/src/mesa/shader/grammar/descrip.mms \
$(DIRECTORY)/src/mesa/shader/grammar/sources \
$(DIRECTORY)/src/mesa/shader/slang/*.[ch] \
$(DIRECTORY)/src/mesa/shader/slang/descrip.mms \
$(DIRECTORY)/src/mesa/shader/slang/sources \
$(DIRECTORY)/src/mesa/shader/slang/library/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/descrip.mms \
$(DIRECTORY)/src/mesa/swrast/sources \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \
$(DIRECTORY)/src/mesa/swrast_setup/sources \
$(DIRECTORY)/src/mesa/tnl/*.[chS] \
$(DIRECTORY)/src/mesa/tnl/descrip.mms \
$(DIRECTORY)/src/mesa/tnl/sources \
$(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \
$(DIRECTORY)/src/mesa/drivers/beos/*.cpp \
$(DIRECTORY)/src/mesa/drivers/beos/Makefile \
$(DIRECTORY)/src/mesa/drivers/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/common/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/common/sources \
$(DIRECTORY)/src/mesa/drivers/directfb/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/directfb/Makefile \
$(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \
$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \
$(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \
$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.def \
$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/x11/sources \
$(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \
$(DIRECTORY)/src/mesa/ppc/*.[ch] \
$(DIRECTORY)/src/mesa/sparc/*.[chS] \
$(DIRECTORY)/src/mesa/x86/Makefile \
$(DIRECTORY)/src/mesa/x86/*.[ch] \
$(DIRECTORY)/src/mesa/x86/*.S \
$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch] \
$(DIRECTORY)/src/mesa/x86-64/*.[chS] \
$(DIRECTORY)/src/mesa/x86-64/Makefile \
$(DIRECTORY)/progs/Makefile \
$(DIRECTORY)/progs/util/README \
$(DIRECTORY)/progs/util/*.[ch] \
$(DIRECTORY)/progs/util/sampleMakefile \
$(DIRECTORY)/vms/analyze_map.com \
$(DIRECTORY)/vms/xlib.opt \
$(DIRECTORY)/vms/xlib_share.opt \
$(DIRECTORY)/windows/VC6/mesa/gdi/gdi.dsp \
$(DIRECTORY)/windows/VC6/mesa/glu/*.txt \
$(DIRECTORY)/windows/VC6/mesa/glu/glu.dsp \
$(DIRECTORY)/windows/VC6/mesa/mesa.dsw \
$(DIRECTORY)/windows/VC6/mesa/mesa/mesa.dsp \
$(DIRECTORY)/windows/VC6/mesa/osmesa/osmesa.dsp \
$(DIRECTORY)/windows/VC7/mesa/gdi/gdi.vcproj \
$(DIRECTORY)/windows/VC7/mesa/glu/glu.vcproj \
$(DIRECTORY)/windows/VC7/mesa/mesa.sln \
$(DIRECTORY)/windows/VC7/mesa/mesa/mesa.vcproj \
$(DIRECTORY)/windows/VC7/mesa/osmesa/osmesa.vcproj
DRI_FILES = \
$(DIRECTORY)/include/GL/internal/dri_interface.h \
$(DIRECTORY)/include/GL/internal/sarea.h \
$(DIRECTORY)/src/glx/Makefile \
$(DIRECTORY)/src/glx/x11/Makefile \
$(DIRECTORY)/src/glx/x11/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/Makefile \
$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \
$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/common/xmlpool/*.po \
$(DIRECTORY)/src/mesa/drivers/dri/*/*.[chS] \
$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \
$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \
$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
SGI_GLU_FILES = \
$(DIRECTORY)/src/glu/Makefile \
$(DIRECTORY)/src/glu/descrip.mms \
$(DIRECTORY)/src/glu/sgi/Makefile \
$(DIRECTORY)/src/glu/sgi/Makefile.win \
$(DIRECTORY)/src/glu/sgi/Makefile.DJ \
$(DIRECTORY)/src/glu/sgi/glu.def \
$(DIRECTORY)/src/glu/sgi/dummy.cc \
$(DIRECTORY)/src/glu/sgi/descrip.mms \
$(DIRECTORY)/src/glu/sgi/mesaglu.opt \
$(DIRECTORY)/src/glu/sgi/include/gluos.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \
$(DIRECTORY)/src/glu/sgi/libtess/README \
$(DIRECTORY)/src/glu/sgi/libtess/alg-outline \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
MESA_GLU_FILES = \
$(DIRECTORY)/src/glu/mesa/README[12] \
$(DIRECTORY)/src/glu/mesa/Makefile* \
$(DIRECTORY)/src/glu/mesa/descrip.mms \
$(DIRECTORY)/src/glu/mesa/mms_depend \
$(DIRECTORY)/src/glu/mesa/*.def \
$(DIRECTORY)/src/glu/mesa/depend \
$(DIRECTORY)/src/glu/mesa/*.[ch]
GLW_FILES = \
$(DIRECTORY)/src/glw/*.[ch] \
$(DIRECTORY)/src/glw/Makefile* \
$(DIRECTORY)/src/glw/README \
$(DIRECTORY)/src/glw/depend
DEMO_FILES = \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \
$(DIRECTORY)/progs/images/*.rgba \
$(DIRECTORY)/progs/demos/Makefile* \
$(DIRECTORY)/progs/demos/descrip.mms \
$(DIRECTORY)/progs/demos/*.[ch] \
$(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \
$(DIRECTORY)/progs/osdemos/Makefile \
$(DIRECTORY)/progs/osdemos/*.c \
$(DIRECTORY)/progs/xdemos/Makefile* \
$(DIRECTORY)/progs/xdemos/descrip.mms \
$(DIRECTORY)/progs/xdemos/*.[chf] \
$(DIRECTORY)/progs/redbook/Makefile* \
$(DIRECTORY)/progs/redbook/README \
$(DIRECTORY)/progs/redbook/*.[ch] \
$(DIRECTORY)/progs/samples/Makefile* \
$(DIRECTORY)/progs/samples/README \
$(DIRECTORY)/progs/samples/*.c \
$(DIRECTORY)/progs/windml/Makefile.ugl \
$(DIRECTORY)/progs/windml/*.c \
$(DIRECTORY)/progs/windml/*.bmp \
$(DIRECTORY)/progs/ggi/*.c \
$(DIRECTORY)/windows/VC6/progs/demos/*.dsp \
$(DIRECTORY)/windows/VC6/progs/progs.dsw \
$(DIRECTORY)/windows/VC7/progs/demos/*.vcproj \
$(DIRECTORY)/windows/VC7/progs/progs.sln
GLUT_FILES = \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/src/glut/glx/Makefile* \
$(DIRECTORY)/src/glut/glx/depend \
$(DIRECTORY)/src/glut/glx/*def \
$(DIRECTORY)/src/glut/glx/descrip.mms \
$(DIRECTORY)/src/glut/glx/mms_depend \
$(DIRECTORY)/src/glut/glx/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.cpp \
$(DIRECTORY)/src/glut/beos/Makefile \
$(DIRECTORY)/src/glut/dos/*.[ch] \
$(DIRECTORY)/src/glut/dos/Makefile.DJ \
$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \
$(DIRECTORY)/src/glut/ggi/*.[ch] \
$(DIRECTORY)/src/glut/ggi/Makefile \
$(DIRECTORY)/src/glut/fbdev/Makefile \
$(DIRECTORY)/src/glut/fbdev/*[ch] \
$(DIRECTORY)/src/glut/mini/*[ch] \
$(DIRECTORY)/windows/VC6/progs/glut/glut.dsp \
$(DIRECTORY)/windows/VC7/progs/glut/glut.vcproj
DEPEND_FILES = \
$(TOP)/src/mesa/depend \
$(TOP)/src/glx/x11/depend \
$(TOP)/src/glw/depend \
$(TOP)/src/glut/glx/depend \
$(TOP)/src/glu/sgi/depend
LIB_FILES = $(MAIN_FILES) $(DRI_FILES) $(SGI_GLU_FILES) $(GLW_FILES)
# Everything for new a Mesa release:
tarballs: rm_depend lib_gz demo_gz glut_gz lib_bz2 demo_bz2 glut_bz2 lib_zip demo_zip glut_zip md5
rm_depend:
@for dep in $(DEPEND_FILES) ; do \
rm -f $$dep ; \
touch $$dep ; \
done
lib_gz:
rm -f configs/current ; \
cd .. ; \
tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
demo_gz:
cd .. ; \
tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
gzip $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.gz $(DIRECTORY)
glut_gz:
cd .. ; \
tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
gzip $(GLUT_NAME).tar ; \
mv $(GLUT_NAME).tar.gz $(DIRECTORY)
lib_bz2:
rm -f configs/current ; \
cd .. ; \
tar -cf $(LIB_NAME).tar $(LIB_FILES) ; \
bzip2 $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
demo_bz2:
cd .. ; \
tar -cf $(DEMO_NAME).tar $(DEMO_FILES) ; \
bzip2 $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
glut_bz2:
cd .. ; \
tar -cf $(GLUT_NAME).tar $(GLUT_FILES) ; \
bzip2 $(GLUT_NAME).tar ; \
mv $(GLUT_NAME).tar.bz2 $(DIRECTORY)
lib_zip:
rm -f configs/current ; \
rm -f $(LIB_NAME).zip ; \
cd .. ; \
zip -qr $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
rm -f $(DEMO_NAME).zip ; \
cd .. ; \
zip -qr $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)
glut_zip:
rm -f $(GLUT_NAME).zip ; \
cd .. ; \
zip -qr $(GLUT_NAME).zip $(GLUT_FILES) ; \
mv $(GLUT_NAME).zip $(DIRECTORY)
md5:
@-md5sum $(LIB_NAME).tar.gz
@-md5sum $(LIB_NAME).tar.bz2
@-md5sum $(LIB_NAME).zip
@-md5sum $(DEMO_NAME).tar.gz
@-md5sum $(DEMO_NAME).tar.bz2
@-md5sum $(DEMO_NAME).zip
@-md5sum $(GLUT_NAME).tar.gz
@-md5sum $(GLUT_NAME).tar.bz2
@-md5sum $(GLUT_NAME).zip

88
Makefile.DJ Normal file
View File

@@ -0,0 +1,88 @@
# Mesa 3-D graphics library
# Version: 4.0
#
# Copyright (C) 1999 Brian Paul All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# DOS/DJGPP makefile for Mesa
#
# Author: Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
#
# Available options:
#
# Environment variables:
# GLIDE path to Glide3 SDK; used with FX.
# default = $(TOP)/glide3
# FX=1 build for 3dfx Glide3. Note that this disables
# compilation of most DMesa code and requires fxMesa.
# As a consequence, you'll need the DJGPP Glide3
# library to build any application.
# default = no
# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
# default = no
#
# Targets:
# all: build everything
# libgl: build GL
# libglu: build GLU
# libglut: build GLUT
# clean: remove object files
# realclean: remove all generated files
#
.PHONY : all libgl libglu libglut clean realclean
CFLAGS = -Wall -W -pedantic
CFLAGS += -O2 -ffast-math
export CFLAGS
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
all: libgl libglu libglut
libgl: lib
$(MAKE) -f Makefile.DJ -C src/mesa
libglu: lib
$(MAKE) -f Makefile.DJ -C src/glu/sgi
libglut: lib
$(MAKE) -f Makefile.DJ -C src/glut/dos
lib:
mkdir lib
clean:
$(MAKE) -f Makefile.DJ clean -C src/mesa
$(MAKE) -f Makefile.DJ clean -C src/glu/mesa
$(MAKE) -f Makefile.DJ clean -C src/glu/sgi
$(MAKE) -f Makefile.DJ clean -C src/glut/dos
realclean: clean
-$(call UNLINK,lib/*.a)
-$(call UNLINK,lib/*.dxe)

View File

@@ -1,664 +0,0 @@
# $Id: Makefile.X11,v 1.32 2000/07/21 16:36:35 brianp Exp $
# Mesa 3-D graphics library
# Version: 3.3
#
# Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Top-level makefile for Mesa
# To add a new configuration for your system add it to the list below
# then update the Make-config file.
SHELL = /bin/sh
default:
@echo "Type one of the following:"
@echo " make aix for IBM RS/6000 with AIX"
@echo " make aix-sl for IBM RS/6000, make shared libs"
@echo " make amiwin for Amiga with SAS/C and AmiWin"
@echo " make amix for Amiga 3000 UX SVR4 v2.1 systems"
@echo " make beos-r4 for BeOS R4"
@echo " make bsdos for BSD/OS from BSDI using GCC"
@echo " make bsdos4 for BSD/OS 4.x, dynamic libraries"
@echo " make cygnus for Win95/NT using Cygnus-Win32"
@echo " make cygnus-linux for Win95/NT using Cygnus-Win32 under Linux"
@echo " make dgux for Data General"
@echo " make freebsd for FreeBSD systems with GCC"
@echo " make freebsd-386 for FreeBSD systems with GCC, w/ Intel assembly"
@echo " make gcc for a generic system with GCC"
@echo " make hpux9 for HP systems with HPUX 9.x"
@echo " make hpux9-sl for HP systems with HPUX 9.x, make shared libs"
@echo " make hpux9-gcc for HP systems with HPUX 9.x using GCC"
@echo " make hpux9-gcc-sl for HP systems with HPUX 9.x, GCC, make shared libs"
@echo " make hpux10 for HP systems with HPUX 10.x"
@echo " make hpux10-sl for HP systems with HPUX 10.x, shared libs"
@echo " make hpux10-gcc for HP systems with HPUX 10.x w/ GCC"
@echo " make hpux10-gcc-sl for HP systems with HPUX 10.x w/ GCC, shared libs"
@echo " make irix4 for SGI systems with IRIX 4.x"
@echo " make irix5 for SGI systems with IRIX 5.x"
@echo " make irix5-gcc for SGI systems with IRIX 5.x using GCC"
@echo " make irix5-dso for SGI systems with IRIX 5.x, make DSOs"
@echo " make irix6-o32 for SGI systems with IRIX 6.x, make o32-bit libs"
@echo " make irix6-o32-dso for SGI systems with IRIX 6.x, make o32-bit DSOs"
@echo " make irix6-n32 for SGI systems with IRIX 6.x, make n32-bit libs"
@echo " make irix6-n32-dso for SGI systems with IRIX 6.x, make n32-bit DSOs"
@echo " make irix6-gcc-n32-sl for SGI systems with IRIX 6.x, GCC, make n32 DSOs"
@echo " make irix6-64 for SGI systems with IRIX 6.x, make 64-bit libs"
@echo " make irix6-64-dso for SGI systems with IRIX 6.x, make 64-bit DSOs"
@echo " make linux for Linux systems, make shared .so libs"
@echo " make linux-static for Linux systems, make static .a libs"
@echo " make linux-386 for Linux on Intel, make shared .so libs"
@echo " make linux-386-static for Linux on Intel, make static .a libs"
@echo " make linux-ggi for Linux systems with libggi"
@echo " make linux-386-ggi for Linux systems with libggi w/ Intel assembly"
@echo " make linux-glide for Linux w/ 3Dfx Glide driver"
@echo " make linux-386-glide for Linux w/ 3Dfx Glide driver, Intel assembly"
@echo " make linux-386-opt-glide for Linux with 3Dfx Voodoo1 for GLQuake"
@echo " make linux-386-opt-V2-glide for Linux with 3Dfx Voodoo2 for GLQuake"
@echo " make linux-3dnow for Linux on AMD w/ 3DNow!"
@echo " make linux-3dnow-glide for Linux on AMD w/ 3DNow! for Glide"
@echo " make linux-katmai for Linux on PentiumIII w/ SSE"
@echo " make linux-katmai-glide for Linux on PentiumIII w/ SSE for Glide"
@echo " make linux-alpha for Linux on Alpha systems"
@echo " make linux-alpha-static for Linux on Alpha systems, static libs"
@echo " make linux-ppc for Linux on PowerPC systems"
@echo " make linux-ppc-static for Linux on PowerPC systems, static libs"
@echo " make linux-sparc for Linux on Sparc systems"
@echo " make linux-sparc5-elf for Sparc5 systems, make ELF shared libs"
@echo " make linux-sparc-ultra for UltraSparc systems, make ELF shared libs"
@echo " make lynxos for LynxOS systems with GCC"
@echo " make macintosh for Macintosh"
@echo " make machten-2.2 for Macs w/ MachTen 2.2 (68k w/ FPU)"
@echo " make machten-4.0 for Macs w/ MachTen 4.0.1 or newer with GNU make"
@echo " make mklinux for Linux on Power Macintosh"
@echo " make netbsd for NetBSD 1.0 systems with GCC"
@echo " make next for NeXT systems with NEXTSTEP 3.3"
@echo " make openbsd for OpenBSD systems"
@echo " make openstep for OpenStep/MacOSX Server systems"
@echo " make os2-x11 for OS/2 with XFree86"
@echo " make osf1 for DEC Alpha systems with OSF/1"
@echo " make osf1-sl for DEC Alpha systems with OSF/1, make shared libs"
@echo " make pgi-cygnus for Cygnus with Portland Group, Inc. compiler"
@echo " make pgi-mingw32 for mingW32 with Portland Group, Inc. compiler"
@echo " make qnx for QNX V4 systems with Watcom compiler"
@echo " make sco for SCO Unix systems with ODT"
@echo " make sco5 for SCO 5.0.5 OpenServer Unix"
@echo " make solaris-x86 for PCs with Solaris"
@echo " make solaris-x86-gcc for PCs with Solaris using GCC"
@echo " make sunos4 for Suns with SunOS 4.x"
@echo " make sunos4-sl for Suns with SunOS 4.x, make shared libs"
@echo " make sunos4-gcc for Suns with SunOS 4.x and GCC"
@echo " make sunos4-gcc-sl for Suns with SunOS 4.x, GCC, make shared libs"
@echo " make sunos5 for Suns with SunOS 5.x"
@echo " make sunos5-sl for Suns with SunOS 5.x, make shared libs"
@echo " make sunos5-ultra for Sun UltraSPARCs with SunOS 5.x"
@echo " make sunos5-ultra-sl for Sun UltraSPARCs with SunOS 5.x, make shared libs"
@echo " make sunos5-thread for Suns with SunOS 5.x, using Solaris threads"
@echo " make sunos5-pthread for Suns with SunOS 5.[56] using POSIX threads"
@echo " make sunos5-gcc-thread for Suns with SunOS 5.x and GCC, using Solaris threads"
@echo " make sunos5-gcc-pthread for Suns with SunOS 5.[56] and GCC, using POSIX threads"
@echo " make sunos5-gcc for Suns with SunOS 5.x and GCC"
@echo " make sunos5-gcc-sl for Suns with SunOS 5.x, GCC, make shared libs"
@echo " make sunos5-x11r6-gcc-sl for Suns with X11R6, GCC, make shared libs"
@echo " make sunos5-gcc-thread for Suns with SunOS 5.x and GCC, using Solaris threads"
@echo " make sunos5-gcc-pthread for Suns with SunOS 5.[56] and GCC, using POSIX threads"
@echo " make sunSolaris-CC for Solaris using C++ compiler"
@echo " make ultrix-gcc for DEC systems with Ultrix and GCC"
@echo " make unicos for Cray C90 (and other?) systems"
@echo " make unixware for PCs running UnixWare"
@echo " make unixware-shared for PCs running UnixWare, shared libs"
@echo " make uwin for Windows NT with AT&T/Wipro UWIN"
@echo " make vistra for Stardent Vistra systems"
@echo " make clean remove .o files"
@echo " make realclean remove .o, library and executable files"
aix aix-sl amix bsdos bsdos4 dgux freebsd freebsd-386 gcc \
hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
irix4 irix5 irix5-gcc irix5-dso irix6-o32 irix6-o32-dso \
linux-static-debug linux-elf-debug linux-prof linux-glide-debug \
linux linux-static \
linux-386 linux-386-static \
linux-glide linux-386-glide linux-386-opt-glide \
linux-386-opt-V2-glide \
linux-3dnow linux-3dnow-glide \
linux-katmai linux-katmai-glide \
linux-alpha-static linux-alpha \
linux-ppc-static linux-ppc \
linux-sparc \
linux-sparc5-elf \
linux-sparc-ultra \
lynxos machten-2.2 machten-4.0 \
mklinux netbsd osf1 osf1-sl openbsd qnx sco sco5 \
solaris-x86 solaris-x86-gcc sunSolaris-CC \
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \
sunos5-thread sunos5-pthread sunos5-gcc-thread sunos5-gcc-pthread \
sunos5-x11r6-gcc-sl ultrix-gcc unicos unixware uwin vistra:
-mkdir lib
if [ -d src ] ; then touch src/depend ; fi
if [ -d src-glu ] ; then touch src-glu/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
irix6-n32 irix6-n32-dso irix6-gcc-n32-sl irix-debug:
-mkdir lib32
if [ -d src ] ; then touch src/depend ; fi
if [ -d src-glu ] ; then touch src-glu/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
irix6-64 irix6-64-dso:
-mkdir lib64
touch src/depend
touch src-glu/depend
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
amiwin:
bin/mklib.amiwin
beos-r4:
-mkdir lib
-rm src/depend
touch src/depend
-rm src-glu/depend
touch src-glu/depend
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d BeOS ] ; then cd BeOS ; $(MAKE) ; fi
if [ -d src-glut.beos ] ; then cd src-glut.beos ; $(MAKE) ; fi
if [ -d src-glut.beos ] ; then cp src-glut.beos/obj*/libglut.so lib ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
pgi-cygnus pgi-mingw32 \
cygnus cygnus-linux:
-mkdir lib
touch src/depend
touch src-glu/depend
if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glu ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
macintosh:
@echo "See the README file for Macintosh intallation information"
next:
-mkdir lib
cd src ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
cd src-glu ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
openstep:
-mkdir lib
cd src ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
cd src-glu ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
os2-x11:
if not EXIST .\lib md lib
touch src/depend
touch src-glu/depend
if exist src-glut touch src-glut/depend
cd src & make -f Makefile.X11 $@
cd src-glu & make -f Makefile.X11 $@
if exist src-glut cd src-glut & make -f Makefile.X11 $@
if exist demos cd demos & make -f Makefile.X11 $@
if exist xdemos cd xdemos & make -f Makefile.X11 $@
if exist samples cd samples & make -f Makefile.X11 $@
if exist book cd book & make -f Makefile.X11 $@
linux-ggi linux-386-ggi:
-mkdir lib
touch src/depend
touch src-glu/depend
if [ -d src-glut ] ; then touch src-glut/depend ; fi
if [ -d widgets-sgi ] ; then touch widgets-sgi/depend ; fi
if [ -d ggi ] ; then touch ggi/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/GGI/default ] ; then cd src/GGI/default ; $(MAKE) ; fi
if [ -d src/GGI/display ] ; then cd src/GGI/display ; $(MAKE) ; fi
if [ -d src-glut ] ; then cd src-glu ; $(MAKE) -f Makefile.X11 $@ ; fi
# if [ -d src-glut ] ; then cd src-glut ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d ggi ] ; then cd ggi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d ggi ] ; then cd ggi/demos; $(MAKE) ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d xdemos ] ; then cd xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d samples ] ; then cd samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d book ] ; then cd book ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d widgets-sgi ] ; then cd widgets-sgi; $(MAKE) -f Makefile.X11 $@ ; fi
# if you change GGI_DEST please change it in ggimesa.conf, too.
DESTDIR=/usr/local
GGI_DEST=lib/ggi/mesa
linux-ggi-install linux-386-ggi-install:
install -d $(DESTDIR)/$(GGI_DEST)/default $(DESTDIR)/$(GGI_DEST)/display $(DESTDIR)/etc/ggi
install -m 0755 src/GGI/default/*.so $(DESTDIR)/$(GGI_DEST)/default
install -m 0755 src/GGI/display/*.so $(DESTDIR)/$(GGI_DEST)/display
install -m 0644 src/GGI/ggimesa.conf $(DESTDIR)/etc/ggi
# if [ -z "`grep ggimesa $(DESTDIR)/etc/ggi/libggi.conf`" ]; then \
# echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
# fi
# Remove .o files, emacs backup files, etc.
clean:
-rm -f ggi/*~ *.o
-rm -f src/GGI/default/*~ *.so
-rm -f src/GGI/display/*~ *.so
-rm -f include/*~
-rm -f include/GL/*~
-rm -f src/*.o src/*~ src/*.a src/*/*.o src/*/*~
-rm -f src-glu/*.o src-glu/*~ src-glu/*.a
-rm -f src-glut/*.o
-rm -f demos/*.o
-rm -f book/*.o book/*~
-rm -f xdemos/*.o xdemos/*~
-rm -f samples/*.o samples/*~
-rm -f ggi/*.o ggi/demos/*.o ggi/*.a
-rm -f widgets-sgi/*.o
-rm -f widgets-mesa/*/*.o
# Remove everything that can be remade
realclean: clean
-rm -f lib/*
cd demos && $(MAKE) -f Makefile.X11 realclean || true
cd xdemos && $(MAKE) -f Makefile.X11 realclean || true
cd book && $(MAKE) -f Makefile.X11 realclean || true
cd samples && $(MAKE) -f Makefile.X11 realclean || true
cd ggi/demos && $(MAKE) -f Makefile.X11 realclean || true
cd src/GGI/default && $(MAKE) -f Makefile.X11 realclean || true
DIRECTORY = Mesa-3.3
LIB_NAME = MesaLib-3.3
DEMO_NAME = MesaDemos-3.3
GLU_NAME = MesaGLU-3.3
GLUT_NAME = GLUT-3.7
LIB_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/acconfig.h \
$(DIRECTORY)/acinclude.m4 \
$(DIRECTORY)/aclocal.m4 \
$(DIRECTORY)/conf.h.in \
$(DIRECTORY)/config.guess \
$(DIRECTORY)/config.sub \
$(DIRECTORY)/configure \
$(DIRECTORY)/configure.in \
$(DIRECTORY)/install-sh \
$(DIRECTORY)/ltconfig \
$(DIRECTORY)/ltmain.sh \
$(DIRECTORY)/missing \
$(DIRECTORY)/mkinstalldirs \
$(DIRECTORY)/stamp-h.in \
$(DIRECTORY)/docs/CONFIG \
$(DIRECTORY)/docs/CONFORM \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/COPYRIGHT \
$(DIRECTORY)/docs/DEVINFO \
$(DIRECTORY)/docs/IAFA-PACKAGE \
$(DIRECTORY)/docs/INSTALL \
$(DIRECTORY)/docs/INSTALL.GNU \
$(DIRECTORY)/docs/README \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/VERSIONS \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/bin/README \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/*.BAT \
$(DIRECTORY)/*.bat \
$(DIRECTORY)/descrip.mms \
$(DIRECTORY)/mms-config \
$(DIRECTORY)/xlib.opt \
$(DIRECTORY)/STARTUP.MK \
$(DIRECTORY)/mesawin32.mak \
$(DIRECTORY)/Names.win \
$(DIRECTORY)/win32-openstep.sh \
$(DIRECTORY)/common.dja \
$(DIRECTORY)/include/GL/Makefile.in \
$(DIRECTORY)/include/GL/Makefile.am \
$(DIRECTORY)/include/GL/dosmesa.h \
$(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glx.h \
$(DIRECTORY)/include/GL/glx_mangle.h \
$(DIRECTORY)/include/GL/mglmesa.h \
$(DIRECTORY)/include/GL/osmesa.h \
$(DIRECTORY)/include/GL/svgamesa.h \
$(DIRECTORY)/include/GL/wmesa.h \
$(DIRECTORY)/include/GL/xmesa.h \
$(DIRECTORY)/include/GL/xmesa_x.h \
$(DIRECTORY)/include/GL/xmesa_xf86.h \
$(DIRECTORY)/include/GLView.h \
$(DIRECTORY)/include/Makefile.in \
$(DIRECTORY)/include/Makefile.am \
$(DIRECTORY)/src/Makefile* \
$(DIRECTORY)/src/descrip.mms \
$(DIRECTORY)/src/mms_depend \
$(DIRECTORY)/src/mesa.conf \
$(DIRECTORY)/src/*.def \
$(DIRECTORY)/src/depend \
$(DIRECTORY)/src/*.[chS] \
$(DIRECTORY)/src/Allegro/*.[ch] \
$(DIRECTORY)/src/BeOS/*.cpp \
$(DIRECTORY)/src/D3D/*.cpp \
$(DIRECTORY)/src/D3D/*.CPP \
$(DIRECTORY)/src/D3D/*.h \
$(DIRECTORY)/src/D3D/*.H \
$(DIRECTORY)/src/D3D/*.c \
$(DIRECTORY)/src/D3D/*.C \
$(DIRECTORY)/src/D3D/MAKEFILE \
$(DIRECTORY)/src/D3D/*bat \
$(DIRECTORY)/src/D3D/*DEF \
$(DIRECTORY)/src/DOS/DEPEND.DOS \
$(DIRECTORY)/src/DOS/*.c \
$(DIRECTORY)/src/FX/Makefile.am \
$(DIRECTORY)/src/FX/Makefile.in \
$(DIRECTORY)/src/FX/*.[ch] \
$(DIRECTORY)/src/FX/*.def \
$(DIRECTORY)/src/FX/X86/Makefile.am \
$(DIRECTORY)/src/FX/X86/Makefile.in \
$(DIRECTORY)/src/FX/X86/*.[Shc] \
$(DIRECTORY)/src/GGI/Makefile.am \
$(DIRECTORY)/src/GGI/Makefile.in \
$(DIRECTORY)/src/GGI/*.[ch] \
$(DIRECTORY)/src/GGI/ggimesa.conf.in \
$(DIRECTORY)/src/GGI/default/*.c \
$(DIRECTORY)/src/GGI/default/Makefile.am \
$(DIRECTORY)/src/GGI/default/Makefile.in \
$(DIRECTORY)/src/GGI/default/genkgi.conf.in \
$(DIRECTORY)/src/GGI/display/*.c \
$(DIRECTORY)/src/GGI/display/Makefile.am \
$(DIRECTORY)/src/GGI/display/Makefile.in \
$(DIRECTORY)/src/GGI/display/fbdev.conf.in \
$(DIRECTORY)/src/GGI/include/Makefile.am \
$(DIRECTORY)/src/GGI/include/Makefile.in \
$(DIRECTORY)/src/GGI/include/ggi/Makefile.am \
$(DIRECTORY)/src/GGI/include/ggi/Makefile.in \
$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.am \
$(DIRECTORY)/src/GGI/include/ggi/mesa/Makefile.in \
$(DIRECTORY)/src/GGI/include/ggi/mesa/*.h \
$(DIRECTORY)/src/KNOWN_BUGS \
$(DIRECTORY)/src/OSmesa/Makefile.am \
$(DIRECTORY)/src/OSmesa/Makefile.in \
$(DIRECTORY)/src/OSmesa/*.[ch] \
$(DIRECTORY)/src/S3/*.[ch] \
$(DIRECTORY)/src/S3/*.def \
$(DIRECTORY)/src/S3/*.mak \
$(DIRECTORY)/src/S3/*.rc \
$(DIRECTORY)/src/SVGA/Makefile.am \
$(DIRECTORY)/src/SVGA/Makefile.in \
$(DIRECTORY)/src/SVGA/*.[ch] \
$(DIRECTORY)/src/Windows/*.[ch] \
$(DIRECTORY)/src/Windows/*.def \
$(DIRECTORY)/src/X/Makefile.am \
$(DIRECTORY)/src/X/Makefile.in \
$(DIRECTORY)/src/X/*.[ch] \
$(DIRECTORY)/src/X86/*.[ch] \
$(DIRECTORY)/src/X86/Makefile.am \
$(DIRECTORY)/src/X86/Makefile.in \
$(DIRECTORY)/src/X86/*.m4 \
$(DIRECTORY)/src/X86/*.S \
$(DIRECTORY)/src-glu/README[12] \
$(DIRECTORY)/src-glu/Makefile* \
$(DIRECTORY)/src-glu/descrip.mms \
$(DIRECTORY)/src-glu/mms_depend \
$(DIRECTORY)/src-glu/*.def \
$(DIRECTORY)/src-glu/depend \
$(DIRECTORY)/src-glu/*.[ch] \
$(DIRECTORY)/widgets-mesa/ChangeLog \
$(DIRECTORY)/widgets-mesa/INSTALL \
$(DIRECTORY)/widgets-mesa/Makefile.in \
$(DIRECTORY)/widgets-mesa/README \
$(DIRECTORY)/widgets-mesa/TODO \
$(DIRECTORY)/widgets-mesa/configure \
$(DIRECTORY)/widgets-mesa/demos/ChangeLog \
$(DIRECTORY)/widgets-mesa/demos/Cube \
$(DIRECTORY)/widgets-mesa/demos/Ed \
$(DIRECTORY)/widgets-mesa/demos/Makefile.in \
$(DIRECTORY)/widgets-mesa/demos/Mcube \
$(DIRECTORY)/widgets-mesa/demos/Tea \
$(DIRECTORY)/widgets-mesa/demos/*.[ch] \
$(DIRECTORY)/widgets-mesa/demos/events \
$(DIRECTORY)/widgets-mesa/include/GL/ChangeLog \
$(DIRECTORY)/widgets-mesa/include/GL/*.h \
$(DIRECTORY)/widgets-mesa/include/GL/Makefile.in \
$(DIRECTORY)/widgets-mesa/man/ChangeLog \
$(DIRECTORY)/widgets-mesa/man/GL* \
$(DIRECTORY)/widgets-mesa/man/Makefile.in \
$(DIRECTORY)/widgets-mesa/man/Mesa* \
$(DIRECTORY)/widgets-mesa/src/ChangeLog \
$(DIRECTORY)/widgets-sgi/*.[ch] \
$(DIRECTORY)/widgets-sgi/Makefile* \
$(DIRECTORY)/widgets-sgi/README \
$(DIRECTORY)/util/README \
$(DIRECTORY)/util/Makefile.am \
$(DIRECTORY)/util/Makefile.in \
$(DIRECTORY)/util/*.[ch] \
$(DIRECTORY)/util/sampleMakefile \
$(DIRECTORY)/vms/analyze_map.com \
$(DIRECTORY)/vms/xlib.opt \
$(DIRECTORY)/vms/xlib_share.opt \
$(DIRECTORY)/BeOS/Makefile \
$(DIRECTORY)/BeOS/*.cpp \
$(DIRECTORY)/WIN32/NMAKE.MAK \
$(DIRECTORY)/WIN32/NMAKE.MIF \
$(DIRECTORY)/WIN32/RES/*rc \
$(DIRECTORY)/WIN32/RES/*def \
$(DIRECTORY)/WIN32/RULES/lib.* \
$(DIRECTORY)/WIN32/RULES/progs.* \
$(DIRECTORY)/macos/README \
$(DIRECTORY)/macos/gli_api/*.h \
$(DIRECTORY)/macos/cglpane/CGLPane.* \
$(DIRECTORY)/macos/include-mac/*.h \
$(DIRECTORY)/macos/libraries/*.stub \
$(DIRECTORY)/macos/libraries/*Stub \
$(DIRECTORY)/macos/projects/*.mcp \
$(DIRECTORY)/macos/projects/*.exp \
$(DIRECTORY)/macos/projects/*.h \
$(DIRECTORY)/macos/resources/*.c \
$(DIRECTORY)/macos/resources/*.r \
$(DIRECTORY)/macos/resources/*.rsrc \
$(DIRECTORY)/macos/src-agl/*.exp \
$(DIRECTORY)/macos/src-agl/*.[ch] \
$(DIRECTORY)/macos/src-gli/*.[ch] \
$(DIRECTORY)/OpenStep
DEMO_FILES = \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/include/GL/glut_h.dja \
$(DIRECTORY)/src-glut/Makefile* \
$(DIRECTORY)/src-glut/depend \
$(DIRECTORY)/src-glut/*def \
$(DIRECTORY)/src-glut/descrip.mms \
$(DIRECTORY)/src-glut/mms_depend \
$(DIRECTORY)/src-glut/*.[ch] \
$(DIRECTORY)/src-glut.dja/* \
$(DIRECTORY)/src-glut.beos/Makefile \
$(DIRECTORY)/src-glut.beos/*.cpp \
$(DIRECTORY)/src-glut.beos/*.h \
$(DIRECTORY)/images/* \
$(DIRECTORY)/demos/Makefile* \
$(DIRECTORY)/demos/descrip.mms \
$(DIRECTORY)/demos/*.[ch] \
$(DIRECTORY)/demos/*.cxx \
$(DIRECTORY)/demos/*.dat \
$(DIRECTORY)/demos/README \
$(DIRECTORY)/xdemos/Makefile* \
$(DIRECTORY)/xdemos/descrip.mms \
$(DIRECTORY)/xdemos/*.[cf] \
$(DIRECTORY)/book/Makefile* \
$(DIRECTORY)/book/README \
$(DIRECTORY)/book/*.[ch] \
$(DIRECTORY)/samples/Makefile* \
$(DIRECTORY)/samples/README \
$(DIRECTORY)/samples/*.c \
$(DIRECTORY)/mtdemos \
$(DIRECTORY)/ggi
GLU_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/src-glu/README[12] \
$(DIRECTORY)/src-glu/Makefile* \
$(DIRECTORY)/src-glu/descrip.mms \
$(DIRECTORY)/src-glu/mms_depend \
$(DIRECTORY)/src-glu/*.def \
$(DIRECTORY)/src-glu/depend \
$(DIRECTORY)/src-glu/*.[ch]
GLUT_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/include/GL/glut_h.dja \
$(DIRECTORY)/src-glut/Makefile* \
$(DIRECTORY)/src-glut/depend \
$(DIRECTORY)/src-glut/*def \
$(DIRECTORY)/src-glut/descrip.mms \
$(DIRECTORY)/src-glut/mms_depend \
$(DIRECTORY)/src-glut/*.[ch] \
$(DIRECTORY)/src-glut.dja/* \
$(DIRECTORY)/src-glut.beos/Makefile \
$(DIRECTORY)/src-glut.beos/*.cpp \
$(DIRECTORY)/src-glut.beos/*.h
lib_tar:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
demo_tar:
cd .. ; \
tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
gzip $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.gz $(DIRECTORY)
glu_tar:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
gzip $(GLU_NAME).tar ; \
mv $(GLU_NAME).tar.gz $(DIRECTORY)
glut_tar:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
gzip $(GLUT_NAME).tar ; \
mv $(GLUT_NAME).tar.gz $(DIRECTORY)
lib_zip:
-rm $(LIB_NAME).zip ; \
cp Makefile.X11 Makefile ; \
cd .. ; \
zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
-rm $(DEMO_NAME).zip ; \
cd .. ; \
zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)
SRC_FILES = \
RELNOTES \
src/Makefile* \
src/depend \
src/*.[chS] \
src/*/*.[ch] \
include/GL/*.h
srctar:
tar -cvf src.tar $(SRC_FILES) ; \
gzip src.tar
srctar.zip:
-rm src.zip
zip -r src.zip $(SRC_FILES) ; \

88
Makefile.mgw Normal file
View File

@@ -0,0 +1,88 @@
# Mesa 3-D graphics library
# Version: 4.0
#
# Copyright (C) 1999 Brian Paul All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# MinGW makefile v1.2 for Mesa
#
# Copyright (C) 2002 - Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
#
# Available options:
#
# Environment variables:
# GLIDE path to Glide3 SDK; used with FX.
# default = $(TOP)/glide3
# FX=1 build for 3dfx Glide3. Note that this disables
# compilation of most WMesa code and requires fxMesa.
# As a consequence, you'll need the Win32 Glide3
# library to build any application.
# default = no
# ICD=1 build the installable client driver interface
# (windows opengl driver interface)
# default = no
# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
# default = no
#
# Targets:
# all: build everything
# libgl: build GL
# clean: remove object files
# realclean: remove all generated files
#
.PHONY : all libgl clean realclean
ifeq ($(ICD),1)
# when -std=c99 mingw will not define WIN32
CFLAGS = -Wall -W -Werror
else
# I love c89
CFLAGS = -Wall -W -pedantic
endif
CFLAGS += -O2 -ffast-math
export CFLAGS
ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
UNLINK = del $(subst /,\,$(1))
else
UNLINK = $(RM) $(1)
endif
all: libgl
libgl: lib
$(MAKE) -f Makefile.mgw -C src/mesa
lib:
mkdir lib
clean:
$(MAKE) -f Makefile.mgw clean -C src/mesa
realclean: clean
-$(call UNLINK,lib/*.a)
-$(call UNLINK,lib/*.dll)

74
bin/installmesa Executable file
View File

@@ -0,0 +1,74 @@
#!/bin/sh
#
# Simple shell script for installing Mesa's header and library files.
# If the copy commands below don't work on a particular system (i.e. the
# -f or -d flags), we may need to branch on `uname` to do the right thing.
#
TOP=.
INCLUDE_DIR="/usr/local/include"
LIB_DIR="/usr/local/lib"
if [ "x$#" = "x0" ] ; then
echo
echo "***** Mesa installation - You may need root privileges to do this *****"
echo
echo "Default directory for header files is:" ${INCLUDE_DIR}
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
if [ "x${INPUT}" != "x" ] ; then
INCLUDE_DIR=${INPUT}
fi
echo
echo "Default directory for library files is:" ${LIB_DIR}
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
if [ "x${INPUT}" != "x" ] ; then
LIB_DIR=${INPUT}
fi
echo
echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
echo "Press <Enter> to continue, or <ctrl>-C to abort."
read INPUT
else
INCLUDE_DIR=$1/include
LIB_DIR=$1/lib
fi
# flags:
# -f = force
# -d = preserve symlinks (does not work on BSD)
if [ `uname` = "FreeBSD" ] ; then
CP_FLAGS="-f"
elif [ `uname` = "Darwin" ] ; then
CP_FLAGS="-f"
elif [ `uname` = "AIX" ] ; then
CP_FLAGS="-fh"
else
CP_FLAGS="-fd"
fi
set -v
mkdir -p ${INCLUDE_DIR}
mkdir -p ${INCLUDE_DIR}/GL
# NOT YET: mkdir -p ${INCLUDE_DIR}/GLES
mkdir -p ${LIB_DIR}
cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
cp -f ${TOP}/src/glw/*.h ${INCLUDE_DIR}/GL
# NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
cp ${CP_FLAGS} ${TOP}/lib*/lib* ${LIB_DIR}
echo "Done."

89
bin/minstall Executable file
View File

@@ -0,0 +1,89 @@
#!/bin/sh
# A minimal replacement for 'install' that supports installing symbolic links.
# Only a limited number of options are supported:
# -d dir Create a directory
# -m mode Sets a file's mode when installing
# If these commands aren't portable, we'll need some "if (arch)" type stuff
SYMLINK="ln -s"
MKDIR="mkdir -p"
RM="rm -f"
MODE=""
if [ "$1" = "-d" ] ; then
# make a directory path
$MKDIR "$2"
exit 0
fi
if [ "$1" = "-m" ] ; then
# set file mode
MODE=$2
shift 2
fi
# install file(s) into destination
if [ $# -ge 2 ] ; then
# Last cmd line arg is the dest dir
for FILE in $@ ; do
DEST="$FILE"
done
# Loop over args, moving them to DEST directory
I=1
for FILE in $@ ; do
if [ $I = $# ] ; then
# stop, don't want to install $DEST into $DEST
exit 0
fi
# determine file's type
if [ -h "$FILE" ] ; then
#echo $FILE is a symlink
# Unfortunately, cp -d isn't universal so we have to
# use a work-around.
# Use ls -l to find the target that the link points to
LL=`ls -l "$FILE"`
for L in $LL ; do
TARGET=$L
done
#echo $FILE is a symlink pointing to $TARGET
FILE=`basename "$FILE"`
# Go to $DEST and make the link
PWDSAVE="$PWD"
cd "$DEST" # pushd
$RM "$FILE"
$SYMLINK "$TARGET" "$FILE"
cd "$PWDSAVE" # popd
elif [ -f "$FILE" ] ; then
#echo "$FILE" is a regular file
$RM "$DEST/`basename $FILE`"
cp "$FILE" "$DEST"
if [ $MODE ] ; then
FILE=`basename "$FILE"`
chmod $MODE "$DEST/$FILE"
fi
else
echo "Unknown type of argument: " "$FILE"
exit 1
fi
I=`expr $I + 1`
done
exit 0
fi
# If we get here, we didn't find anything to do
echo "Usage:"
echo " install -d dir Create named directory"
echo " install [-m mode] file [...] dest Install files in destination"

788
bin/mklib Executable file
View File

@@ -0,0 +1,788 @@
#!/bin/sh
# Make a shared library.
# This script should be useful for projects other than Mesa.
# Improvements/fixes are welcome.
# Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Option defaults
#
LIBNAME=""
MAJOR=1
MINOR=0
PATCH=""
DEPS=""
LINK=""
CPLUSPLUS=0
STATIC=0
DLOPEN=0
INSTALLDIR="."
ARCH="auto"
ARCHOPT=""
NOPREFIX=0
EXPORTS=""
#
# Parse arguments
#
while true
do
case $1 in
'-h' | '--help')
echo 'Usage: mklib [options] objects'
echo 'Create a shared library from object files.'
echo ' -o LIBRARY specifies the name of the resulting library, without'
echo ' the leading "lib" or any suffix.'
echo ' (eg: "-o GL" might result in "libGL.so" being made)'
echo ' -major N specifies major version number (default is 1)'
echo ' -minor N specifies minor version number (default is 0)'
echo ' -patch N specifies patch version number (default is 0)'
echo ' -lLIBRARY specifies a dependency on LIBRARY'
echo ' -LDIR search in DIR for library dependencies'
echo ' -linker L explicity specify the linker program to use (eg: gcc, g++)'
echo ' Not observed on all systems at this time.'
echo ' -cplusplus link with C++ runtime'
echo ' -static make a static library (default is dynamic/shared)'
echo ' -dlopen make a shared library suitable for dynamic loading'
echo ' -install DIR put resulting library file(s) in DIR'
echo ' -arch ARCH override using `uname` to determine host system'
echo ' -archopt OPT specify an extra achitecture-specific option OPT'
echo " -noprefix don't prefix library name with 'lib' nor add any suffix"
echo ' -exports FILE only export the symbols listed in FILE'
echo ' -h, --help display this information and exit'
exit 1
;;
'-o')
shift 1;
LIBNAME=$1
;;
'-major')
shift 1;
MAJOR=$1
;;
'-minor')
shift 1;
MINOR=$1
;;
'-patch')
shift 1;
PATCH=$1
;;
'-linker')
shift 1;
LINK=$1
;;
-l*)
DEPS="$DEPS $1"
;;
-L*)
DEPS="$DEPS $1"
;;
'-cplusplus')
CPLUSPLUS=1
;;
'-static')
STATIC=1
;;
'-dlopen')
DLOPEN=1
;;
'-install')
shift 1;
INSTALLDIR=$1
;;
'-arch')
shift 1;
ARCH=$1
;;
'-archopt')
shift 1;
ARCHOPT=$1
;;
'-noprefix')
NOPREFIX=1
;;
'-exports')
shift 1;
EXPORTS=$1
;;
-*)
echo "mklib: Unknown option: " $1 ;
exit 1
;;
*)
# This should be the first object file, stop parsing
break
esac
shift 1
done
OBJECTS=$@
if [ ${ARCH} = "auto" ] ; then
ARCH=`uname`
fi
#
# Error checking
#
if [ "x${LIBNAME}" = "x" ] ; then
echo "mklib: Error: no library name specified"
exit 1
fi
if [ "x${OBJECTS}" = "x" ] ; then
echo "mklib: Error: no object files specified"
exit 1
fi
#
# Debugging info
#
if [ ] ; then
echo "-----------------"
echo ARCH is $ARCH
echo LIBNAME is $LIBNAME
echo MAJOR is $MAJOR
echo MINOR is $MINOR
echo PATCH is $PATCH
echo DEPS are $DEPS
echo "EXPORTS in" $EXPORTS
echo "-----------------"
fi
#
# OK, make the library now
#
case $ARCH in
'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
# we assume gcc
if [ "x$LINK" = "x" ] ; then
# -linker was not specified so set default link command now
if [ $CPLUSPLUS = 1 ] ; then
LINK=g++
else
LINK=gcc
fi
fi
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
#OPTS="-shared -Wl,-soname,${LIBNAME}" # soname???
OPTS="-shared"
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
OPTS="-m32 ${OPTS}"
fi
rm -f ${LIBNAME}
# make lib
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# finish up
FINAL_LIBS="${LIBNAME}"
elif [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}" # prefix with "lib"
echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ru"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
ranlib ${LIBNAME}.a
# finish up
FINAL_LIBS=${LIBNAME}.a
else
LIBNAME="lib${LIBNAME}" # prefix with "lib"
case $ARCH in 'Linux' | 'GNU' | GNU/*)
OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
;;
*)
OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
;;
esac
if [ $EXPORTS ] ; then
#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
# Make the 'exptmp' file for --version-script option
echo "VERSION_${MAJOR}.${MINOR} {" > exptmp
echo "global:" >> exptmp
sed 's/$/;/' ${EXPORTS} >> exptmp
echo "local:" >> exptmp
echo "*;" >> exptmp
echo "};" >> exptmp
OPTS="${OPTS} -Xlinker --version-script=exptmp"
# exptmp is removed below
fi
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
OPTS="-m32 ${OPTS}"
fi
if [ x${PATCH} = "x" ] ; then
VERSION="${MAJOR}.${MINOR}"
else
VERSION="${MAJOR}.${MINOR}.${PATCH}"
fi
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
# rm any old libs
rm -f ${LIBNAME}.so.${VERSION}
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
# make lib
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
# finish up
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
# rm -f exptmp
fi
;;
'SunOS')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making SunOS static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
if [ $NOPREFIX = 0 ] ; then
LIBNAME="lib${LIBNAME}.so"
fi
echo "mklib: Making SunOS shared library: " ${LIBNAME}
if [ "x$LINK" = "x" ] ; then
# -linker was not specified, choose default linker now
if [ $CPLUSPLUS = 1 ] ; then
# determine linker and options for C++ code
if [ `which c++` ] ; then
# use Sun c++
LINK="c++"
elif [ `type g++` ] ; then
# use g++
LINK="g++"
else
echo "mklib: warning: can't find C++ comiler, trying CC."
LINK="CC"
fi
else
# use native Sun linker for C code
LINK="ld"
fi
fi
# linker options
if [ ${LINK} = "ld" -o ${LINK} = "cc" -o ${LINK} = "CC" ] ; then
# SunOS tools, -G to make shared libs
OPTS="-G"
else
# gcc linker
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" ] ; then
OPTS="-m32 -shared -Wl,-Bdynamic"
else
OPTS="-m64 -shared -Wl,-Bdynamic"
fi
fi
# Check if objects are SPARC v9
# file says: ELF 64-bit MSB relocatable SPARCV9 Version 1
set ${OBJECTS}
SPARCV9=`file $1 | grep SPARCV9`
if [ "${SPARCV9}" ] ; then
OPTS="${OPTS} -xarch=v9"
fi
# for debug:
#echo "mklib: linker is" ${LINK} ${OPTS}
if [ $NOPREFIX = 1 ] ; then
rm -f ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
else
rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
fi
FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
fi
;;
'FreeBSD')
# we assume gcc
if [ "x$LINK" = "x" ] ; then
# -linker was not specified so set default link command now
if [ $CPLUSPLUS = 1 ] ; then
LINK=g++
else
LINK=gcc
fi
fi
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
OPTS="-shared"
rm -f ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
elif [ $STATIC = 1 ] ; then
STLIB="lib${LIBNAME}.a"
echo "mklib: Making FreeBSD static library: " ${STLIB}
rm -f ${STLIB}
ar cq ${STLIB} ${OBJECTS}
ranlib ${STLIB}
FINAL_LIBS=${STLIB}
else
SHLIB="lib${LIBNAME}.so.${MAJOR}"
OPTS="-shared -Wl,-soname,${SHLIB}"
echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB}
${LINK} ${OPTS} -o ${SHLIB} ${OBJECTS} ${DEPS}
ln -sf ${SHLIB} "lib${LIBNAME}.so"
FINAL_LIBS="${SHLIB} lib${LIBNAME}.so"
fi
;;
'NetBSD')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}_pic.a"
echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar cq ${LIBNAME} ${OBJECTS}
ranlib ${LIBNAME}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
rm -f ${LIBNAME}
ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
fi
;;
'IRIX' | 'IRIX64')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
rm -f ${LIBNAME}
ar rc ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
# examine first object to determine ABI
set ${OBJECTS}
ABI_O32=`file $1 | grep 'ELF 32-bit'`
ABI_N32=`file $1 | grep 'ELF N32'`
ABI_N64=`file $1 | grep 'ELF 64-bit'`
if [ "${ABI_O32}" ] ; then
OPTS="-32 -shared -all"
ABI="o32-bit"
elif [ "${ABI_N32}" ] ; then
OPTS="-n32 -shared -all"
ABI="n32-bit"
elif [ "${ABI_N64}" ] ; then
OPTS="-64 -shared -all"
ABI="64-bit"
else
echo "Error: Unexpected IRIX ABI!"
exit 1
fi
if [ $CPLUSPLUS = 1 ] ; then
LINK="CC"
else
LINK="ld"
fi
echo "mklib: Making IRIX " ${ABI} " shared library: " ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
fi
;;
'linux-cygwin')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making linux-cygwin library: " ${LIBNAME}
rm -f ${LIBNAME}
gnuwin32ar ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'HP-UX')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making HP-UX static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
# HP uses a .2 for their current GL/GLU libraries
if [ ${LIBNAME} = "GL" -o ${LIBNAME} = "GLU" ] ; then
MAJOR=2
fi
RUNLIB="lib${LIBNAME}.${MAJOR}"
DEVLIB="lib${LIBNAME}.sl"
echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
ln -s ${RUNLIB} ${DEVLIB}
FINAL_LIBS="${RUNLIB} ${DEVLIB}"
fi
;;
'AIX' )
# examine first object to determine ABI
set ${OBJECTS}
ABI_64=`file $1 | grep '64-bit'`
if [ "${ABI_64}" ] ; then
X64="-X64"
Q64="-q64"
OFILE=shr_64.o
else
OFILE=shr.o #Want to be consistent with the IBM libGL.a
fi
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX static library: " ${LIBNAME}
ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
EXPFILE="lib${LIBNAME}.exp"
LIBNAME="lib${LIBNAME}.a" # shared objects are still stored in the .a libraries
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry ${Q64}"
rm -f ${EXPFILE} ${OFILE}
NM="/bin/nm -eC ${X64}"
echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
${NM} ${OBJECTS} | awk '{
if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
# On AIX a shared library is linked differently when
# you want to dlopen the file
if [ $DLOPEN = "1" ] ; then
cc -G ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
else
cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
ar ${X64} -r ${LIBNAME} ${OFILE}
fi
FINAL_LIBS="${LIBNAME}"
fi
;;
'OpenSTEP')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making OpenSTEP static library: " ${LIBNAME}
libtool -static -o ${LIBNAME} - ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'OSF1')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making OSF/1 static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
VERSION="${MAJOR}.${MINOR}"
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making OSF/1 shared library: " ${LIBNAME}
if [ "x$LINK" = "x" ] ; then
if [ $CPLUSPLUS = 1 ] ; then
LINK=cxx
else
LINK=cc
fi
fi
rm -f ${LIBNAME}.${VERSION}
${LINK} -o ${LIBNAME}.${VERSION} -shared -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
FINAL_LIBS="${LIBNAME} ${LIBNAME}.${VERSION}"
fi
;;
'Darwin')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making Darwin static library: " ${LIBNAME}
LINK="ar"
OPTS="-ruvs"
${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
# On Darwin a .bundle is used for a library that you want to dlopen
if [ $DLOPEN = "1" ] ; then
LIBSUFFIX="bundle"
OPTS="${ARCHOPT} -bundle -multiply_defined suppress"
else
LIBSUFFIX="dylib"
OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
fi
LINKNAME="lib${LIBNAME}.${LIBSUFFIX}"
LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}"
# examine first object to determine ABI
set ${OBJECTS}
ABI_PPC=`file $1 | grep 'object ppc'`
ABI_I386=`file $1 | grep 'object i386'`
if [ "${ABI_PPC}" ] ; then
OPTS="${OPTS} -arch ppc"
fi
if [ "${ABI_I386}" ] ; then
OPTS="${OPTS} -arch i386"
fi
# XXX can we always add -isysroot /Developer/SDKs/MacOSX10.4u.sdk
# to OPTS here?
# determine linker
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="cc"
fi
echo "mklib: Making Darwin shared library: " ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME} ${LINKNAME}
FINAL_LIBS="${LIBNAME} ${LINKNAME}"
fi
;;
'LynxOS')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making LynxOS static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'BeOS')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making BeOS static library: " ${LIBNAME}
ar -cru "${LIBNAME}" ${OBJECTS}
else
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making BeOS shared library: " ${LIBNAME}
gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
mimeset -f "${LIBNAME}"
# XXX remove the Mesa3D stuff here since mklib isn't mesa-specific.
setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
fi
FINAL_LIBS=${LIBNAME}
;;
'QNX')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making QNX library: " ${LIBNAME}
wlib ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'MorphOS')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making MorphOS library: " ${LIBNAME}
ppc-morphos-ar rc ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
;;
'icc' | 'icc-istatic')
# Intel C compiler
# This should get merged into the Linux code, above, since this isn't
# really a different architecture.
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $STATIC = 1 ] ; then
echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ruv"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
# finish up
FINAL_LIBS="${LIBNAME}.a"
else
if [ $ARCH = icc-istatic ] ; then
OPTS="-shared -i-static -cxxlib-icc"
else
OPTS="-shared"
fi
VERSION="${MAJOR}.${MINOR}.${PATCH}"
echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
if [ $CPLUSPLUS = 1 ] ; then
LINK="icpc"
else
LINK="icc"
fi
# rm any old libs
rm -f ${LIBNAME}.so.${VERSION}
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
# make lib
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
# finish up
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
fi
;;
'aix-gcc')
# AIX with gcc
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX GCC static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
echo "mklib: Making AIX GCC shared library: " ${LIBNAME}
# remove old lib
rm -f ${LIBNAME}
# make the lib
gcc -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME}
# NOTE: the application linking with this library must specify
# the -Wl,-brtl flags to gcc
FINAL_LIBS=${LIBNAME}
fi
;;
'ultrix')
# XXX untested
if [ $STATIC = 0 ] ; then
echo "mklib: Warning shared libs not supported on Ultrix"
fi
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making static library for Ultrix: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
;;
CYGWIN*)
# GCC-based environment
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $STATIC = 1 ] ; then
echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ru"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
ranlib ${LIBNAME}.a
# finish up
FINAL_LIBS=${LIBNAME}.a
else
OPTS="-shared -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}-${MAJOR}.dll
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="gcc"
fi
# rm any old libs
rm -f ${LIBNAME}-${MAJOR}.dll
rm -f ${LIBNAME}.dll.a
rm -f ${LIBNAME}.a
# make lib
${LINK} ${OPTS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
# finish up
FINAL_LIBS="${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a"
# special case for installing in bin
FINAL_BINS="${CYGNAME}-${MAJOR}.dll"
fi
;;
'example')
# If you're adding support for a new architecture, you can
# start with this:
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making static library for example arch: " ${LIBNAME}
rm -f ${LIBNAME}
ar rv ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
echo "mklib: Making shared library for example arch: " ${LIBNAME}
ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS="${LIBNAME}"
fi
;;
*)
echo "mklib: ERROR: Don't know how to make a static/shared library for" ${ARCH}
echo "mklib: Please add necessary commands to mklib script."
;;
esac
#
# Put library files into installation directory if specified.
#
if [ ${INSTALLDIR} != "." ] ; then
echo "mklib: Installing" ${FINAL_LIBS} "in" ${INSTALLDIR}
mv ${FINAL_LIBS} ${INSTALLDIR}/
fi

View File

@@ -1,153 +0,0 @@
#!/bin/ksh
# Make an AIX shared library (tricky!!!)
# Based on a script from Athanasios G. Gaitatzes (gaitat@vnet.ibm.com)
# Improved by Greg Thompson <gregt@visix.com> -gt
#--identification------------------------------------------------------
# $Id: mklib.aix,v 1.2 1999/09/15 15:10:20 brianp Exp $
# $Log: mklib.aix,v $
# Revision 1.2 1999/09/15 15:10:20 brianp
# added third, tiny version number to arguments
#
# Revision 1.1 1999/08/19 13:52:56 brianp
# initial check-in (post-crash)
#
#--common--------------------------------------------------------------
LIBRARY=$1
shift 1
MAJOR=$1
shift 1
MINOR=$1
shift 1
TINY=$1
shift 1
OBJECTS=$*
#--platform------------------------------------------------------------
# BASENAME = LIBRARY without .a suffix
BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
# Name of exports file
EXPFILE=${BASENAME}.exp
# Name of temporary shared lib file
OFILE=shr.o
####OFILE=${BASENAME}.o
# Remove any old files from previous make
rm -f ${LIBRARY} ${EXPFILE} ${OFILE}
# Pick a way to use nm -gt
NM=${NM-/bin/nm -eC}
# Determine which version of AIX this is
AIXVERSION=`uname -v`
# Pick a way to tell the linker there's no entrypoint -gt
case ${AIXVERSION}
{
3*)
ENTRY='-e _nostart'
;;
4*)
ENTRY=-bnoentry
;;
*)
echo "Error in mklib.aix!"
exit 1
;;
}
# Other libraries which we may be dependent on. Since we make the libraries
# in the order libGL.a, libaGLU.a, libglut.a just depends on its predecessor.
# modified to make otherlibs in the form of -lfoo -gt
OTHERLIBS=`ls ../lib/*.a | sed "s/..\/lib\/lib/-l/g" | sed "s/\.a//g"`
##echo OTHERLIBS are ${OTHERLIBS}
# Make exports (.exp) file header
echo "#! ${LIBRARY}" > ${EXPFILE}
# Append list of exported symbols to exports file -gt
case ${AIXVERSION}
{
3*)
${NM} ${OBJECTS} | awk -F'|' '{
if ($3 != "extern" || substr($7,1,1) == " ") continue
sub (" *", "", $1); sub (" *", "", $7)
if ( (($7 == ".text") || ($7 == ".data") || ($7 == ".bss")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
;;
4*)
${NM} ${OBJECTS} | awk '{
if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
;;
}
# This next line is a hack to allow full compatibility with IBM's OpenGL
# libraries. IBM mistakenly exports glLoadIdentity from the libGLU.a
# library. We have to do the same thing. Problem reported by Yemi Adesanya
# (adesanya@afsmail.cern.ch) and Patrick Brown (pbrown@austin.ibm.com)
if [ "${BASENAME}" = libGLU ] ; then
echo "glLoadIdentity" >> ${EXPFILE}
fi
# Make the shared lib file
cc -o ${OFILE} ${OBJECTS} -L../lib ${OTHERLIBS} -lX11 -lXext -lXmu -lXi -lm -lc -bE:${EXPFILE} -bM:SRE ${ENTRY}
# Make the .a file
ar ruv ${LIBRARY} ${OFILE}
# Put exports file in Mesa lib directory
mv ${EXPFILE} ../lib
# Remove OFILE
rm -f ${OFILE}
#NOTES
# AIX 4.x /usr/bin/nm -B patch from ssclift@mach.me.queensu.ca (Simon Clift)
# Robustified symbol extraction for AIX 3 and 4
# Greg Thompson <gregt@visix.com>

View File

@@ -1,38 +0,0 @@
#!/bin/sh
# Make a standard Unix .a library file with 'ar ruv'
#--identification------------------------------------------------------
# $Id: mklib.ar-ruv,v 1.2 1999/09/15 15:10:20 brianp Exp $
# $Log: mklib.ar-ruv,v $
# Revision 1.2 1999/09/15 15:10:20 brianp
# added third, tiny version number to arguments
#
# Revision 1.1 1999/08/19 13:52:57 brianp
# initial check-in (post-crash)
#
#--common--------------------------------------------------------------
LIBRARY=$1
shift 1
MAJOR=$1
shift 1
MINOR=$1
shift 1
TINY=$1
shift 1
OBJECTS=$*
#--platform-------------------------------------------------------------
#ar ruv $LIBRARY $OBJECTS
ar ru $LIBRARY $OBJECTS

View File

@@ -1,52 +0,0 @@
#!/bin/sh
# Make a Solaris shared library
# contributed by Arno Hahma (arno@nitro.pp.utu.fi)
#--identification------------------------------------------------------
# $Id: mklib.solaris,v 1.2 1999/09/15 15:10:20 brianp Exp $
# $Log: mklib.solaris,v $
# Revision 1.2 1999/09/15 15:10:20 brianp
# added third, tiny version number to arguments
#
# Revision 1.1 1999/08/19 13:53:06 brianp
# initial check-in (post-crash)
#
#--common--------------------------------------------------------------
LIBRARY=$1
shift 1
MAJOR=$1
shift 1
MINOR=$1
shift 1
TINY=$1
shift 1
OBJECTS=$*
#--platform-------------------------------------------------------------
set -x
LIBRARY=`basename $LIBRARY .a`
VERSION=$MAJOR.$MINOR
echo "Building shared object $LIBRARY.so.$VERSION and the archive library $LIBRARY.a"
rm -f ${LIBRARY}.a ${LIBRARY}.so.${VERSION}
ar ruv ${LIBRARY}.a ${OBJECTS}
ld -G -o ${LIBRARY}.so.${VERSION} ${OBJECTS}
cp ${LIBRARY}.a ${LIBRARY}.so.${VERSION} ../lib
cd ../lib
ln -s ${LIBRARY}.so.${VERSION} ${LIBRARY}.so

1
configs/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
current

30
configs/aix Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for AIX, dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = aix
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3 -DPTHREADS
CXXFLAGS = -O -DAIXV3 -DPTHREADS
# Misc tools and flags
MKLIB_OPTIONS =
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC

27
configs/aix-64 Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for AIX 64-bit, dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = aix-64
# Compiler and flags
CC = xlc
CXX = xlC
CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/lib64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lpthread -lC

25
configs/aix-64-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for AIX, static libs
include $(TOP)/configs/default
CONFIG_NAME = aix-64-static
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS = -static
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
APP_LIB_DEPS = -q64 -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC

19
configs/aix-gcc Normal file
View File

@@ -0,0 +1,19 @@
# Configuration for AIX with gcc
include $(TOP)/configs/default
CONFIG_NAME = aix-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -DAIXV3
CXXFLAGS = -O2 -DAIXV3
MKLIB_OPTIONS = -arch aix-gcc
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi

25
configs/aix-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for AIX, static libs
include $(TOP)/configs/default
CONFIG_NAME = aix-static
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3 -DPTHREADS
CXXFLAGS = -O -DAIXV3 -DPTHREADS
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
-lX11 -lXext -lXmu -lXi -lm -lpthread -lC

100
configs/beos Normal file
View File

@@ -0,0 +1,100 @@
# Configuration for BeOS
# Written by Philippe Houdoin
include $(TOP)/configs/default
CONFIG_NAME = beos
DEFINES = \
-DBEOS_THREADS
MACHINE=$(shell uname -m)
ifeq ($(MACHINE), BePC)
CPU = x86
else
CPU = ppc
endif
ifeq ($(CPU), x86)
# BeOS x86 settings
DEFINES += \
-DGNU_ASSEMBLER \
-DUSE_X86_ASM \
-DUSE_MMX_ASM \
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)
CC = gcc
CXX = g++
LD = gcc
CFLAGS = \
-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
LDFLAGS += -Xlinker
ifdef DEBUG
CFLAGS += -g -O0
LDFLAGS += -g
DEFINES += -DDEBUG
else
CFLAGS += -O3
endif
GLUT_CFLAGS = -fexceptions
else
# BeOS PPC settings
CC = mwcc
CXX = $(CC)
LD = mwldppc
CFLAGS = \
-w on -requireprotos \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
LDFLAGS += \
-export pragma \
-init _init_routine_ \
-term _term_routine_ \
-lroot \
/boot/develop/lib/ppc/glue-noinit.a \
/boot/develop/lib/ppc/init_term_dyn.o \
/boot/develop/lib/ppc/start_dyn.o
ifdef DEBUG
CFLAGS += -g -O0
CXXFLAGS += -g -O0
LDFLAGS += -g
else
CFLAGS += -O7
CXXFLAGS += -O7
endif
GLUT_CFLAGS = -fexceptions
endif
# Directories
SRC_DIRS = mesa glu glut/beos
GLU_DIRS = sgi
DRIVER_DIRS = beos
PROGRAM_DIRS = beos samples redbook demos tests
# Library/program dependencies
GL_LIB_DEPS =
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS =
GLUT_LIB_DEPS = -lgame -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
APP_LIB_DEPS = -lbe -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)

29
configs/darwin Normal file
View File

@@ -0,0 +1,29 @@
# Configuration for Darwin / MacOS X, making dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
CC = cc
CXX = cc
CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
GLUT_LIB_NAME = libglut.dylib
GLW_LIB_NAME = libGLw.dylib
OSMESA_LIB_NAME = libOSMesa.dylib
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
SRC_DIRS = mesa glu glut/glx

24
configs/darwin-static Normal file
View File

@@ -0,0 +1,24 @@
# Configuration for Darwin / MacOS X, making static libs
include $(TOP)/configs/darwin
CONFIG_NAME = darwin-static
# Compiler and flags
CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm

View File

@@ -0,0 +1,26 @@
# Configuration for Darwin / MacOS X, making static libs
include $(TOP)/configs/darwin
CONFIG_NAME = darwin-static
# Compiler and flags
CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -static -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -Wl,-search_paths_first -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lstdc++ -lgcc_s.1 -lm

33
configs/darwin-x86ppc Normal file
View File

@@ -0,0 +1,33 @@
# Configuration for Darwin / MacOS X, making dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
CC = cc
CXX = cc
CFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -archopt "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
GLUT_LIB_NAME = libglut.dylib
GLW_LIB_NAME = libGLw.dylib
OSMESA_LIB_NAME = libOSMesa.dylib
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
SRC_DIRS = mesa glu glut/glx

86
configs/default Normal file
View File

@@ -0,0 +1,86 @@
# Default/template configuration
# This is included by other config files which may override some
# of these variables.
# Think of this as a base class from which configs are derived.
CONFIG_NAME = default
# Version info
MESA_MAJOR=6
MESA_MINOR=5
MESA_TINY=2
# external projects. This should be useless now that we use libdrm.
DRM_SOURCE_PATH=$(TOP)/../drm
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -O
CXXFLAGS = -O
GLU_CFLAGS =
# Misc tools and flags
MKLIB_OPTIONS =
MKDEP = makedepend
MKDEP_OPTIONS = -fdepend
MAKE = make
INSTALL = $(TOP)/bin/minstall
# Python and flags (generally only needed by the developers)
PYTHON2 = python
PYTHON_FLAGS = -t -O -O
# Library names (base name)
GL_LIB = GL
GLU_LIB = GLU
GLUT_LIB = glut
GLW_LIB = GLw
OSMESA_LIB = OSMesa
# Library names (actual file names)
GL_LIB_NAME = lib$(GL_LIB).so
GLU_LIB_NAME = lib$(GLU_LIB).so
GLUT_LIB_NAME = lib$(GLUT_LIB).so
GLW_LIB_NAME = lib$(GLW_LIB).so
OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
# Optional assembly language optimization files for libGL
ASM_SOURCES =
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
GLW_SOURCES = GLwDrawA.c
# Directories to build
LIB_DIR = lib
SRC_DIRS = mesa glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
# Which subdirs under $(TOP)/progs/ to enter:
PROGRAM_DIRS = demos redbook samples xdemos
# Library/program dependencies
#EXTRA_LIB_PATH ?=
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
# Installation directories (for make install)
INSTALL_DIR = /usr/local
DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
# Where libGL will look for DRI hardware drivers
DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)

27
configs/freebsd Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for FreeBSD
include $(TOP)/configs/default
CONFIG_NAME = FreeBSD
# Compiler and flags
CC = cc
CXX = c++
MAKE = gmake
OPT_FLAGS = -O2
PIC_FLAGS = -fPIC
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
-DHZ=100 -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = -I/usr/X11R6/include
CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
GLUT_CFLAGS = -fexceptions
EXTRA_LIB_PATH = -L/usr/X11R6/lib
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm

50
configs/freebsd-dri Normal file
View File

@@ -0,0 +1,50 @@
# -*-makefile-*-
# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
include $(TOP)/configs/freebsd
CONFIG_NAME = freebsd-dri
# Compiler and flags
CC = gcc
CXX = g++
WARN_FLAGS = -Wall
OPT_FLAGS = -O
EXPAT_INCLUDES = -I/usr/local/include
X11_INCLUDES = -I/usr/X11R6/include
DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)
ASM_SOURCES =
# Library/program dependencies
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread $(LIBDRM_LIB)
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
# Directories
SRC_DIRS = glx/x11 mesa glu glut/glx glw
DRIVER_DIRS = dri
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
DRM_SOURCE_PATH=$(TOP)/../drm
# ffb and gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
unichrome savage sis

10
configs/freebsd-dri-amd64 Normal file
View File

@@ -0,0 +1,10 @@
# -*-makefile-*-
# Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers
include $(TOP)/configs/freebsd-dri
CONFIG_NAME = freebsd-dri-x86-64
ASM_FLAGS = -DUSE_X86_64_ASM
ASM_SOURCES = $(X86-64_SOURCES)
ASM_API = $(X86-64_API)

13
configs/freebsd-dri-x86 Normal file
View File

@@ -0,0 +1,13 @@
# -*-makefile-*-
# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
include $(TOP)/configs/freebsd-dri
CONFIG_NAME = freebsd-dri-x86
# Unnecessary on x86, generally.
PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

14
configs/hpux10 Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for HPUX v10, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux10
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
APP_LIB_DEPS = -$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

16
configs/hpux10-gcc Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for HPUX v10, with gcc
include $(TOP)/configs/default
CONFIG_NAME = hpux10-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
GLUT_CFLAGS = -fexceptions
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

30
configs/hpux10-static Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for HPUX v10, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux10-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++

30
configs/hpux11-32 Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for HPUX v11
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS =
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)

27
configs/hpux11-32-static Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for HPUX v11, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl

View File

@@ -0,0 +1,26 @@
# Configuration for HPUX v11, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

31
configs/hpux11-64 Normal file
View File

@@ -0,0 +1,31 @@
# Configuration for HPUX v11, 64-bit
include $(TOP)/configs/default
CONFIG_NAME = hpux11-64
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS =
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)
GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)

27
configs/hpux11-64-static Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for HPUX v11, 64-bit, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-64-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS = -static
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread -lCsup -lcl

30
configs/hpux11-ia64 Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for HPUX IA64 v11, 64-bit
include $(TOP)/configs/default
CONFIG_NAME = hpux11-ia64
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS =
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.so
GLU_LIB_NAME = libGLU.so
GLUT_LIB_NAME = libglut.so
GLW_LIB_NAME = libGLw.so
OSMESA_LIB_NAME = libOSMesa.so
# Library/program dependencies
GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(GL_LIB_DEPS)
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)

View File

@@ -0,0 +1,27 @@
# Configuration for HPUX v11, 64-bit, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-ia64-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
MKLIB_OPTIONS = -static
LIB_DIR = lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lXt -lX11 -lpthread -lm -lCsup -lcl

16
configs/hpux9 Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for HPUX v9, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux9
# Compiler and flags
CC = cc
# XXX fix this
CXX = c++
CFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm

14
configs/hpux9-gcc Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for HPUX v10, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux9-gcc
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

17
configs/irix6-64 Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for IRIX 6.x, make n64 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-64
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib64
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lpthread -lm

26
configs/irix6-64-static Normal file
View File

@@ -0,0 +1,26 @@
# Configuration for IRIX 6.x, make n64 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-64-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM -DPTHREADS
CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
MKLIB_OPTIONS = -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib64
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

17
configs/irix6-n32 Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for IRIX 6.x, make n32 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-n32
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM -DPTHREADS
CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lpthread -lm

25
configs/irix6-n32-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for IRIX 6.x, make n32 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-n32-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM -DPTHREADS
CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
MKLIB_OPTIONS = -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

18
configs/irix6-o32 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for IRIX 6.x, make o32 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-o32
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -rpath $(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm

25
configs/irix6-o32-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for IRIX 6.x, make o32 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-o32-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
MKLIB_OPTIONS = -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = lib32
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

33
configs/linux Normal file
View File

@@ -0,0 +1,33 @@
# Configuration for generic Linux
include $(TOP)/configs/default
CONFIG_NAME = linux
# Compiler and flags
CC = gcc
CXX = g++
OPT_FLAGS = -O3 -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
# to build properly on 64-bit platforms.
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = -I/usr/X11R6/include
CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
$(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(X11_INCLUDES)
GLUT_CFLAGS = -fexceptions
EXTRA_LIB_PATH = -L/usr/X11R6/lib

18
configs/linux-alpha Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for Linux on Alpha
include $(TOP)/configs/default
CONFIG_NAME = linux-alpha
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

View File

@@ -0,0 +1,27 @@
# Configuration for Linux on Alpha, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-alpha-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm

8
configs/linux-debug Normal file
View File

@@ -0,0 +1,8 @@
# Configuration for debugging on Linux
include $(TOP)/configs/linux
CONFIG_NAME = linux-debug
OPT_FLAGS = -g -ansi -pedantic
DEFINES += -DDEBUG -DDEBUG_MATH

34
configs/linux-directfb Normal file
View File

@@ -0,0 +1,34 @@
# Configuration for DirectFB
include $(TOP)/configs/default
CONFIG_NAME = linux-directfb
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
-D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
ifeq ($(HAVE_X86), yes)
CFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)
endif
# Directories
SRC_DIRS = mesa glu glut/directfb
GLU_DIRS = sgi
DRIVER_DIRS = directfb
PROGRAM_DIRS = demos directfb
# Library/program dependencies
GL_LIB_DEPS = -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB)
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -l$(GLU_LIB) -l$(GLUT_LIB)

70
configs/linux-dri Normal file
View File

@@ -0,0 +1,70 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/default
CONFIG_NAME = linux-dri
# Compiler and flags
CC = gcc
CXX = g++
#MKDEP = /usr/X11R6/bin/makedepend
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = -I/usr/X11R6/include
CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
ASM_SOURCES =
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-lm -lpthread -ldl \
$(LIBDRM_LIB)
# This is now 0 by default since it seems to confuse the hell out of people
# and generate a lot of extra noise on bugzilla. If you need to build with
# EGL, do 'make linux-dri USING_EGL=1'
USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = egl
else
SRC_DIRS = glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS =
endif
DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome ffb nouveau

16
configs/linux-dri-debug Normal file
View File

@@ -0,0 +1,16 @@
# -*-makefile-*-
# Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-debug
OPT_FLAGS = -O0 -g
ARCH_FLAGS = -DDEBUG
# Helpful to reduce the amount of stuff that gets built sometimes:
#DRI_DIRS = i915tex i915
#DRI_DIRS = i965
#DRI_DIRS = radeon r200 r300
#DRI_DIRS = unichrome sis trident
#DRI_DIRS = i810 mga r128 tdfx

17
configs/linux-dri-ppc Normal file
View File

@@ -0,0 +1,17 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-ppc
OPT_FLAGS = -Os -mcpu=603
PIC_FLAGS = -fPIC
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
ASM_SOURCES = $(PPC_SOURCES)
# Build only the drivers for cards that exist on PowerPC. At some point MGA
# will be added, but not yet.
DRI_DIRS = mach64 r128 r200 r300 radeon tdfx

17
configs/linux-dri-x86 Normal file
View File

@@ -0,0 +1,17 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-x86
# Unnecessary on x86, generally.
PIC_FLAGS =
# Add -m32 to CFLAGS:
ARCH_FLAGS = -m32
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

24
configs/linux-dri-x86-64 Normal file
View File

@@ -0,0 +1,24 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-x86-64
ARCH_FLAGS = -m64
ASM_FLAGS = -DUSE_X86_64_ASM
ASM_SOURCES = $(X86-64_SOURCES)
ASM_API = $(X86-64_API)
LIB_DIR = lib64
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib64
# ffb, gamma, and sis are missing because they have not be converted to use
# the new interface. i810 are missing because there is no x86-64
# system where they could *ever* be used.
#
DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300

68
configs/linux-dri-xcb Normal file
View File

@@ -0,0 +1,68 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/default
CONFIG_NAME = linux-dri-xcb
# Compiler and flags
CC = gcc
CXX = g++
#MKDEP = /usr/X11R6/bin/makedepend
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
OPT_FLAGS = -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
ASM_SOURCES =
# Library/program dependencies
EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
LIBDRM_LIB = `pkg-config --libs libdrm`
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
# This is now 0 by default since it seems to confuse the hell out of people
# and generate a lot of extra noise on bugzilla. If you need to build with
# EGL, do 'make linux-dri USING_EGL=1'
USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS = egl
else
SRC_DIRS = glx/x11 mesa glu glut/glx glw
PROGRAM_DIRS =
endif
DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome ffb

16
configs/linux-fbdev Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for Linux fbdev interface
include $(TOP)/configs/linux
CONFIG_NAME = linux-fbdev
CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
SRC_DIRS = mesa glu glut/fbdev
DRIVER_DIRS = fbdev osmesa
PROGRAM_DIRS = fbdev demos redbook samples
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
OSMESA_LIB_DEPS = -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm

20
configs/linux-glide Normal file
View File

@@ -0,0 +1,20 @@
# Configuration for generic Linux with 3Dfx Glide driver
include $(TOP)/configs/default
CONFIG_NAME = linux-glide
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

21
configs/linux-ia64-icc Normal file
View File

@@ -0,0 +1,21 @@
# Configuration for Linux with Intel C compiler
include $(TOP)/configs/default
CONFIG_NAME = linux-icc
# Compiler and flags
CC = icc
CXX = icpc
CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -arch icc-istatic
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB)

View File

@@ -0,0 +1,27 @@
# Configuration for Linux with Intel C compiler, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-icc-static
# Compiler and flags
CC = icc
CXX = icpc
CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static -arch icc-istatic
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -i-static -cxxlib-icc -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lpthread -lm -lcxa -lunwind

22
configs/linux-icc Normal file
View File

@@ -0,0 +1,22 @@
# Configuration for Linux with Intel C compiler
include $(TOP)/configs/default
CONFIG_NAME = linux-icc
# Compiler and flags
CC = icc
CXX = g++
CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -arch icc
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

27
configs/linux-icc-static Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for Linux with Intel C compiler, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-icc-static
# Compiler and flags
CC = icc
CXX = icpc
CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3 -tpp6 -axK -DPTHREADS
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static -arch icc
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS =
GLUT_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

50
configs/linux-indirect Normal file
View File

@@ -0,0 +1,50 @@
# -*-makefile-*-
# Configuration for linux-indirect: Builds a libGL capable of indirect
# rendering, but *NOT* capable of direct rendering.
include $(TOP)/configs/default
CONFIG_NAME = linux-dri
# Compiler and flags
CC = gcc
CXX = g++
#MKDEP = /usr/X11R6/bin/makedepend
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
WARN_FLAGS = -Wall
OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DGLX_INDIRECT_RENDERING \
-DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
X11_INCLUDES = -I/usr/X11R6/include
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
ASM_SOURCES =
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib
DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
# Directories
SRC_DIRS = glx/x11 glu glut/glx glw
DRIVER_DIRS =
PROGRAM_DIRS =
WINDOW_SYSTEM=dri

25
configs/linux-osmesa Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for building only libOSMesa on Linux, no Xlib driver
# This doesn't really have any Linux dependencies, so it should be usable
# on other (gcc-based) systems.
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS = osdemos
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa -lGLU

28
configs/linux-osmesa16 Normal file
View File

@@ -0,0 +1,28 @@
# Configuration for 16 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa16
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Library names
OSMESA_LIB = OSMesa16
OSMESA_LIB_NAME = libOSMesa16.so
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa16

View File

@@ -0,0 +1,28 @@
# Configuration for 16 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa16-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
# Library names
OSMESA_LIB = OSMesa16
OSMESA_LIB_NAME = libOSMesa16.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
APP_LIB_DEPS = -lOSMesa16

28
configs/linux-osmesa32 Normal file
View File

@@ -0,0 +1,28 @@
# Configuration for 32 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa32
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Library names
OSMESA_LIB = OSMesa32
OSMESA_LIB_NAME = libOSMesa32.so
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
APP_LIB_DEPS = -lOSMesa32

9
configs/linux-ppc Normal file
View File

@@ -0,0 +1,9 @@
# Configuration for Linux on PPC
include $(TOP)/configs/linux
CONFIG_NAME = linux-ppc
OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
# FIXME: Use of PowerPC assembly should be enabled here.

14
configs/linux-ppc-static Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for Linux on PPC, static libs
include $(TOP)/configs/linux-ppc
CONFIG_NAME = linux-ppc-static
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

29
configs/linux-profile Normal file
View File

@@ -0,0 +1,29 @@
# Configuration for profiling on Linux with gprof
include $(TOP)/configs/default
CONFIG_NAME = linux-profile
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG
CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG
GLUT_CFLAGS = -fexceptions
# Need to have -L/usr/X11R6/lib in these:
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
# Need to make static libs for profiling:
MKLIB_OPTIONS = -static
GL_LIB_NAME = lib$(GL_LIB).a
GLU_LIB_NAME = lib$(GLU_LIB).a
GLUT_LIB_NAME = lib$(GLUT_LIB).a
GLW_LIB_NAME = lib$(GLW_LIB).a
OSMESA_LIB_NAME = lib$(OSMesa).a
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread

43
configs/linux-solo Normal file
View File

@@ -0,0 +1,43 @@
# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
include $(TOP)/configs/default
CONFIG_NAME = linux-solo
# Compiler and flags
CC = gcc
CXX = g++
WARN_FLAGS = -Wall -Wundef
OPT_FLAGS = -O3 -g
PIC_FLAGS = -fPIC
# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
ARCH_FLAGS ?=
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE -DHAVE_POSIX_MEMALIGN \
-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -DIN_DRI_DRIVER
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
ASM_SOURCES =
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR)
GL_LIB_DEPS = -lm -lpthread -ldl
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
# Directories
SRC_DIRS = glx/mini mesa glu glut/mini
DRIVER_DIRS = dri
PROGRAM_DIRS = miniglx
#DRI_DIRS = ffb gamma sis savage
DRI_DIRS = i810 i915 mach64 mga r128 r200 radeon tdfx unichrome fb

7
configs/linux-solo-ia64 Normal file
View File

@@ -0,0 +1,7 @@
# Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
include $(TOP)/configs/linux-solo
CONFIG_NAME = linux-solo-ia64
DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome

13
configs/linux-solo-x86 Normal file
View File

@@ -0,0 +1,13 @@
# -*-makefile-*-
# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86
include $(TOP)/configs/linux-solo
CONFIG_NAME = linux-solo-x86
# Unnecessary on x86, generally.
PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

9
configs/linux-sparc Normal file
View File

@@ -0,0 +1,9 @@
# Configuration for Linux on Sparc
include $(TOP)/configs/linux
CONFIG_NAME = linux-sparc
#ASM_FLAGS = -DUSE_SPARC_ASM
#ASM_SOURCES = $(SPARC_SOURCES)
#ASM_API = $(SPARC_API)

7
configs/linux-sparc5 Normal file
View File

@@ -0,0 +1,7 @@
# Configuration for Linux on Sparc5
include $(TOP)/configs/linux-sparc
CONFIG_NAME = linux-sparc5
ARCH_FLAGS += -mcpu=ultrasparc

26
configs/linux-static Normal file
View File

@@ -0,0 +1,26 @@
# Configuration for generic Linux, making static libs
include $(TOP)/configs/linux
CONFIG_NAME = linux-static
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
# Need to specify all libraries we may need
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \
-L/usr/X11R6/lib/ -lX11 -lXmu -lXi -lpthread

7
configs/linux-ultrasparc Normal file
View File

@@ -0,0 +1,7 @@
# Configuration for Linux on UltraSparc
include $(TOP)/configs/linux-sparc
CONFIG_NAME = linux-ultrasparc
ARCH_FLAGS += -mv8 -mtune=ultrasparc

9
configs/linux-x86 Normal file
View File

@@ -0,0 +1,9 @@
# Configuration for Linux with x86 optimizations
include $(TOP)/configs/linux
CONFIG_NAME = linux-x86
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)

7
configs/linux-x86-32 Normal file
View File

@@ -0,0 +1,7 @@
# To build Linux x86 32-bit in an x86-64 environment
include $(TOP)/configs/linux-x86
CONFIG_NAME = linux-x86-32
ARCH_FLAGS += -m32

14
configs/linux-x86-64 Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for Linux for 64-bit X86 (Opteron)
include $(TOP)/configs/linux
CONFIG_NAME = linux-x86-64
ARCH_FLAGS = -m64
ASM_SOURCES = $(X86-64_SOURCES)
ASM_API = $(X86-64_API)
ASM_FLAGS = -DUSE_X86_64_ASM
LIB_DIR = lib64
EXTRA_LIB_PATH = -L/usr/X11R6/lib64

View File

@@ -0,0 +1,7 @@
# Configuration for Linux for 64-bit X86 (Opteron)
include $(TOP)/configs/linux-x86-64
CONFIG_NAME = linux-x86-64-debug
DEFINES += -DDEBUG -DDEBUG_MATH

View File

@@ -0,0 +1,23 @@
# Configuration for Linux for 64-bit X86 (Opteron), static libs
include $(TOP)/configs/linux-x86-64
CONFIG_NAME = linux-x86-64-static
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
$(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

9
configs/linux-x86-debug Normal file
View File

@@ -0,0 +1,9 @@
# Configuration for Linux with x86 code, but no gcc optimizations and
# debugging enabled.
include $(TOP)/configs/linux-x86
CONFIG_NAME = linux-x86-debug
OPT_FLAGS = -g
DEFINES += -DDEBUG -DDEBUG_MATH

25
configs/linux-x86-glide Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for Linux with 3Dfx Glide driver and x86 optimizations
include $(TOP)/configs/default
CONFIG_NAME = linux-x86-glide
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
ASM_SOURCES = $(X86_SOURCES)
ASM_API = $(X86_API)
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

23
configs/linux-x86-static Normal file
View File

@@ -0,0 +1,23 @@
# Configuration for Linux with x86 optimizations, static libs
include $(TOP)/configs/linux-x86
CONFIG_NAME = linux-x86-static
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
$(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm

14
configs/netbsd Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for NetBSD
include $(TOP)/configs/default
CONFIG_NAME = netbsd
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
CXXFLAGS = -O2 -fPIC
GLUT_CFLAGS = -fexceptions
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

18
configs/openbsd Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for OpenBSD
include $(TOP)/configs/default
CONFIG_NAME = openbsd
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

16
configs/osf1 Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for OSF/1
include $(TOP)/configs/default
CONFIG_NAME = osf1
# Compiler and flags
CC = cc
CXX = cxx
CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT
CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lpthread -lm

17
configs/osf1-static Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for OSF/1
include $(TOP)/configs/default
CONFIG_NAME = osf1
# Compiler and flags
CC = cc
CXX = cxx
CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT
CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
MKLIB_OPTIONS = -static
GL_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
APP_LIB_DEPS = -noso -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -so_archive -lX11 -lXext -lXmu -lXi -lpthread -lm -lcxx

18
configs/solaris-x86 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for Solaris on x86
include $(TOP)/configs/default
CONFIG_NAME = solaris-x86
# Compiler and flags
CC = cc
CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
MKLIB_OPTIONS = -static
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

17
configs/solaris-x86-gcc Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for Solaris on x86 with gcc, dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = solaris-x86-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
CXXFLAGS = -O3 -march=i486 -fPIC
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu

View File

@@ -0,0 +1,24 @@
# Configuration for Solaris on x86 with gcc, static libs
include $(TOP)/configs/default
CONFIG_NAME = solaris-x86-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
CXXFLAGS = -O3 -march=i486 -fPIC
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXi -lXmu
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

12
configs/sunos4 Normal file
View File

@@ -0,0 +1,12 @@
# Configuration for SunOS 4, shared libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4
# Compiler and flags
CC = acc
CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm

15
configs/sunos4-gcc Normal file
View File

@@ -0,0 +1,15 @@
# Configuration for SunOS 4, with gcc, shared libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm

25
configs/sunos4-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for SunOS 4, static libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4-static
# Compiler and flags
CC = acc
CFLAGS = -O -DUSE_XSHM -DSUNOS4
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm

18
configs/sunos5 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for SunOS 5
include $(TOP)/configs/default
CONFIG_NAME = sunos5
# Compiler and flags
CC = cc
CXX = c++
CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM
CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include
GLUT_CFLAGS = -DSOLARIS_2_4_BUG
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

11
configs/sunos5-64-gcc Normal file
View File

@@ -0,0 +1,11 @@
# Configuration for 64-bit SunOS 5, with gcc
include $(TOP)/configs/sunos5-gcc
CONFIG_NAME = sunos5-64-gcc
# only set vars that differ from sunos5-gcc config
OPT_FLAGS = -O3 -m64 -mcpu=ultrasparc -mv8plus -mvis -g -fomit-frame-pointer -pipe
ARCH_FLAGS = -m64

36
configs/sunos5-gcc Normal file
View File

@@ -0,0 +1,36 @@
# Configuration for SunOS 5, with gcc
include $(TOP)/configs/default
CONFIG_NAME = sunos5-gcc
# Compiler and flags
CC = gcc
CXX = g++
WARN_FLAGS = -Wall
OPT_FLAGS = -O3 -g -fomit-frame-pointer -pipe
PIC_FLAGS = -fPIC
ARCH_FLAGS ?=
DEFINES = -D_REENTRANT -DUSE_XSHM
ASM_SOURCES = $(SPARC_SOURCES)
ASM_API = $(SPARC_API)
ASM_FLAGS = -DUSE_SPARC_ASM
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
$(ASM_FLAGS) -std=c99 -ffast-math -I/usr/openwin/include
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-I/usr/openwin/include
GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/openwin/lib
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

19
configs/sunos5-smp Normal file
View File

@@ -0,0 +1,19 @@
# Configuration for SunOS 5, SMP systems
include $(TOP)/configs/default
CONFIG_NAME = sunos5-smp
# Compiler and flags
CC = cc
CXX = c++
CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG
CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include
GLUT_CFLAGS = -DSOLARIS_2_4_BUG
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun

Some files were not shown because too many files have changed in this diff Show More