OSDN Git Service
Brian Paul [Wed, 15 Nov 2006 23:38:02 +0000 (23:38 +0000)]
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...
Brian Paul [Wed, 15 Nov 2006 23:19:52 +0000 (23:19 +0000)]
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.
Brian Paul [Wed, 15 Nov 2006 21:52:20 +0000 (21:52 +0000)]
reindent, add some comments
Brian Paul [Wed, 15 Nov 2006 21:41:24 +0000 (21:41 +0000)]
reindent
Brian Paul [Wed, 15 Nov 2006 21:39:57 +0000 (21:39 +0000)]
indent, comments
Brian Paul [Wed, 15 Nov 2006 21:39:32 +0000 (21:39 +0000)]
s/int/GLboolean/
Brian Paul [Wed, 15 Nov 2006 21:38:26 +0000 (21:38 +0000)]
improved error mesages
Brian Paul [Wed, 15 Nov 2006 21:35:06 +0000 (21:35 +0000)]
fix casts to silence warnings
Brian Paul [Wed, 15 Nov 2006 19:54:25 +0000 (19:54 +0000)]
#define LONGSTRING __extension__ in imports.h and use it to silence gcc
warnings about long string literals.
Brian Paul [Wed, 15 Nov 2006 18:56:48 +0000 (18:56 +0000)]
Comments for operations.
Jerome Glisse [Wed, 15 Nov 2006 17:45:05 +0000 (17:45 +0000)]
Remove use of GetBufferSize (depreciated).
Brian Paul [Wed, 15 Nov 2006 14:59:05 +0000 (14:59 +0000)]
more bug fixes
Keith Whitwell [Tue, 14 Nov 2006 14:22:43 +0000 (14:22 +0000)]
Make sure RENDER_FINISH is called on the zero pixel case. Reported by
Haihao Xiang.
Ian Romanick [Tue, 14 Nov 2006 00:10:34 +0000 (00:10 +0000)]
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.
Ian Romanick [Mon, 13 Nov 2006 23:34:35 +0000 (23:34 +0000)]
Clean-up compiler warnings.
Ian Romanick [Mon, 13 Nov 2006 22:54:43 +0000 (22:54 +0000)]
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.
Ian Romanick [Mon, 13 Nov 2006 22:51:11 +0000 (22:51 +0000)]
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.
Ian Romanick [Mon, 13 Nov 2006 21:53:04 +0000 (21:53 +0000)]
Major clean-up of tdfxDDGetString.
Ian Romanick [Mon, 13 Nov 2006 21:21:40 +0000 (21:21 +0000)]
Eliminate use of deprecated GetBufferSize interface.
Ian Romanick [Mon, 13 Nov 2006 20:54:51 +0000 (20:54 +0000)]
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.
Ian Romanick [Fri, 10 Nov 2006 21:11:39 +0000 (21:11 +0000)]
Added information about added GLX_SGI_make_current_read support
Ian Romanick [Fri, 10 Nov 2006 21:06:23 +0000 (21:06 +0000)]
Bump driver date.
Ian Romanick [Fri, 10 Nov 2006 18:57:30 +0000 (18:57 +0000)]
Refactor savageXMesaSet{Back,Front}ClipRects.
Refactor savageXMesaSetBackClipRects and savageXMesaSetFrontClipRects
into a single new routine called savageXMesaSetClipRects. This allows
a few cleanups in the code.
Ian Romanick [Fri, 10 Nov 2006 18:47:22 +0000 (18:47 +0000)]
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.
Brian Paul [Fri, 10 Nov 2006 12:47:56 +0000 (12:47 +0000)]
fix -noprefix option for Solaris (bug 7722)
Dave Airlie [Fri, 10 Nov 2006 00:32:35 +0000 (00:32 +0000)]
Fix up texture compression at least Get and TexImage, not too sure about
how to fix SubTexImage with compressed textures
Ian Romanick [Fri, 10 Nov 2006 00:14:30 +0000 (00:14 +0000)]
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.
Ian Romanick [Thu, 9 Nov 2006 22:28:09 +0000 (22:28 +0000)]
Remove unnecessary setting of GetBufferSize to NULL.
Adam Jackson [Thu, 9 Nov 2006 20:47:22 +0000 (20:47 +0000)]
Fix some && (logical) that should clearly have been & (bitwise).
Dave Airlie [Wed, 8 Nov 2006 22:25:52 +0000 (22:25 +0000)]
remove drm stuff from libGL, this is now in libdrm 2.3.0
Roland Scheidegger [Sun, 5 Nov 2006 23:13:19 +0000 (23:13 +0000)]
fix vp lockups due to incorrectly set up / emitted attrib inputs.
Roland Scheidegger [Sun, 5 Nov 2006 22:21:11 +0000 (22:21 +0000)]
fix using VERT_ATTRIB_WEIGHT instead of VERT_BIT_WEIGHT when assigning vp inputs.
Brian Paul [Sun, 5 Nov 2006 15:30:41 +0000 (15:30 +0000)]
reindent
Jerome Glisse [Sun, 5 Nov 2006 00:47:27 +0000 (00:47 +0000)]
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.
Jerome Glisse [Sat, 4 Nov 2006 23:50:27 +0000 (23:50 +0000)]
Add cos instruction and remove left over debug.
Brian Paul [Sat, 4 Nov 2006 17:31:45 +0000 (17:31 +0000)]
Fix for glGetVertexAttribfvNV, bug 8883
Brian Paul [Sat, 4 Nov 2006 17:31:21 +0000 (17:31 +0000)]
fix error msg
Brian Paul [Sat, 4 Nov 2006 17:28:38 +0000 (17:28 +0000)]
fix for glGetVertexAttribfvARB, bug 8883
Brian Paul [Fri, 3 Nov 2006 23:43:14 +0000 (23:43 +0000)]
#define _glapi_Dispatch _mglapi_Dispatch when USE_MGL_NAMESPACE is set.
Brian Paul [Fri, 3 Nov 2006 23:32:30 +0000 (23:32 +0000)]
Fix _mesa_IsProgram() and _mesa_IsShader()
Brian Paul [Fri, 3 Nov 2006 23:28:36 +0000 (23:28 +0000)]
check for USE_MGL_NAMESPACE
Brian Paul [Fri, 3 Nov 2006 22:23:47 +0000 (22:23 +0000)]
implement _mesa_GetShaderiv()
Brian Paul [Fri, 3 Nov 2006 22:15:43 +0000 (22:15 +0000)]
implement _mesa_GetProgramiv()
Brian Paul [Fri, 3 Nov 2006 21:51:58 +0000 (21:51 +0000)]
Simplify GET_CURRENT_LINKED_PROGRAM() macro and calling code.
Brian Paul [Fri, 3 Nov 2006 21:30:16 +0000 (21:30 +0000)]
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.
Brian Paul [Fri, 3 Nov 2006 20:25:44 +0000 (20:25 +0000)]
plug in 2.0, 2.1 functions
Brian Paul [Fri, 3 Nov 2006 20:20:28 +0000 (20:20 +0000)]
Added OpenGL 2.1 entrypoints.
Brian Paul [Fri, 3 Nov 2006 19:55:01 +0000 (19:55 +0000)]
Set DO_DEBUG=0
Brian Paul [Fri, 3 Nov 2006 19:54:40 +0000 (19:54 +0000)]
only enabled memcpy timing if DO_DEBUG=1
Brian Paul [Fri, 3 Nov 2006 18:35:52 +0000 (18:35 +0000)]
replace CONFIG_H with MESA_CONFIG_H_INCLUDED
Brian Paul [Fri, 3 Nov 2006 18:29:39 +0000 (18:29 +0000)]
added 1.3/1.4 function mangling
Brian Paul [Fri, 3 Nov 2006 17:43:20 +0000 (17:43 +0000)]
assorted updates for 6.5.2
Brian Paul [Fri, 3 Nov 2006 17:29:31 +0000 (17:29 +0000)]
Added OpenGL 2.1 glUniformMatrix* functions.
Refactor the _mesa_UniformMatrix() functions to use a helper function.
Implement GetUniformfv function (might need more work someday).
Brian Paul [Fri, 3 Nov 2006 17:18:05 +0000 (17:18 +0000)]
reformat comments in Doxygen style
Brian Paul [Fri, 3 Nov 2006 16:50:22 +0000 (16:50 +0000)]
reindent
Brian Paul [Fri, 3 Nov 2006 15:18:17 +0000 (15:18 +0000)]
Minor changes to get ready for OpenGL 2.1.
Roland Scheidegger [Fri, 3 Nov 2006 12:48:18 +0000 (12:48 +0000)]
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.).
Roland Scheidegger [Fri, 3 Nov 2006 02:07:34 +0000 (02:07 +0000)]
remove setting some driver funcs explicitly to NULL, as they are no longer set up later. Thix fixes a segfault in _mesa_Bitmap().
Brian Paul [Fri, 3 Nov 2006 00:16:12 +0000 (00:16 +0000)]
added fsligght
Brian Paul [Fri, 3 Nov 2006 00:04:06 +0000 (00:04 +0000)]
yet another deriviative of the fplight.c demo for OpenGL 2.0 shading language
Brian Paul [Thu, 2 Nov 2006 23:58:27 +0000 (23:58 +0000)]
Update gl_API.xml with OpenGL 2.0 functions, regenerate derived files.
Brian Paul [Thu, 2 Nov 2006 23:56:08 +0000 (23:56 +0000)]
minor change in _mesa_ResizeBuffersMESA()
Brian Paul [Thu, 2 Nov 2006 23:43:22 +0000 (23:43 +0000)]
include utils.h to silence warning
Brian Paul [Thu, 2 Nov 2006 23:41:37 +0000 (23:41 +0000)]
s/GLuint/int/ to silence warnings
Brian Paul [Thu, 2 Nov 2006 23:40:24 +0000 (23:40 +0000)]
casting, type changes to silence warnings
Brian Paul [Thu, 2 Nov 2006 23:34:02 +0000 (23:34 +0000)]
s/GLint/GLuint/ to fix sign warnings
Brian Paul [Thu, 2 Nov 2006 23:29:03 +0000 (23:29 +0000)]
fix typo, silence warnings
Brian Paul [Thu, 2 Nov 2006 23:16:18 +0000 (23:16 +0000)]
Fix GL_EXT_packed_depth_stencil crash, but shadowtex still broken
Brian Paul [Thu, 2 Nov 2006 22:56:27 +0000 (22:56 +0000)]
comment about a valgrind error
Brian Paul [Thu, 2 Nov 2006 22:55:59 +0000 (22:55 +0000)]
s/GLchan/GLubyte/ in debug code
Brian Paul [Thu, 2 Nov 2006 22:54:18 +0000 (22:54 +0000)]
init SecondaryRasterColor
Brian Paul [Thu, 2 Nov 2006 22:53:32 +0000 (22:53 +0000)]
Added GL_STENCIL_BACK_WRITEMASK
Brian Paul [Thu, 2 Nov 2006 22:40:43 +0000 (22:40 +0000)]
check for shader extensions for OpenGL 2.0
Brian Paul [Thu, 2 Nov 2006 22:39:29 +0000 (22:39 +0000)]
Undo some of yesterday's ATI_separate_stencil changes. The ATI extension
doesn't exactly match OpenGL 2.0.
Brian Paul [Thu, 2 Nov 2006 21:43:06 +0000 (21:43 +0000)]
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().
Brian Paul [Thu, 2 Nov 2006 21:39:20 +0000 (21:39 +0000)]
Call _mesa_problem() from i915_program_error() so we get a nice error message.
Jerome Glisse [Thu, 2 Nov 2006 20:02:26 +0000 (20:02 +0000)]
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).
Brian Paul [Thu, 2 Nov 2006 19:23:41 +0000 (19:23 +0000)]
remove GetBufferSize = NULL; assignment
Brian Paul [Thu, 2 Nov 2006 19:18:09 +0000 (19:18 +0000)]
Fixes Glean vertex/fragment test failures. Those tests never called
glViewport so the viewport was 0 by 0 pixels.
Brian Paul [Thu, 2 Nov 2006 19:16:08 +0000 (19:16 +0000)]
remove GetBufferSize code
Brian Paul [Thu, 2 Nov 2006 18:35:19 +0000 (18:35 +0000)]
always load frag prog state params for now (see comments)
Brian Paul [Thu, 2 Nov 2006 18:15:26 +0000 (18:15 +0000)]
remove unneeded extern declaration of lockMutex
Brian Paul [Thu, 2 Nov 2006 18:13:40 +0000 (18:13 +0000)]
bump driver date
Brian Paul [Thu, 2 Nov 2006 17:51:04 +0000 (17:51 +0000)]
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.
Brian Paul [Thu, 2 Nov 2006 17:49:47 +0000 (17:49 +0000)]
new RGBA_LOGICOP_ENABLED() macro
Brian Paul [Thu, 2 Nov 2006 16:21:04 +0000 (16:21 +0000)]
s/_mesa_IsProgram2/_mesa_IsProgram/
Brian Paul [Thu, 2 Nov 2006 16:20:29 +0000 (16:20 +0000)]
Rename _mesa_IsProgram() to _mesa_IsProgramARB() to avoid collision with the
OpenGL 2.0 function of the same name.
Brian Paul [Thu, 2 Nov 2006 16:11:31 +0000 (16:11 +0000)]
OpenGL 2.0 entrypoints
Brian Paul [Thu, 2 Nov 2006 16:09:10 +0000 (16:09 +0000)]
run indent on the code
Brian Paul [Thu, 2 Nov 2006 15:47:30 +0000 (15:47 +0000)]
test OpenGL 2.0 stencil funcs
Brian Paul [Thu, 2 Nov 2006 00:41:40 +0000 (00:41 +0000)]
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.
Brian Paul [Wed, 1 Nov 2006 22:28:54 +0000 (22:28 +0000)]
update _mesa_select_tex_image() and _mesa_get_tex_image()
Brian Paul [Wed, 1 Nov 2006 20:48:00 +0000 (20:48 +0000)]
update comments
Brian Paul [Wed, 1 Nov 2006 19:35:22 +0000 (19:35 +0000)]
Remove x/y/width/height parameters from Clear functions.
Brian Paul [Wed, 1 Nov 2006 19:26:18 +0000 (19:26 +0000)]
comment-out unused var
Brian Paul [Wed, 1 Nov 2006 19:25:43 +0000 (19:25 +0000)]
remove unused vars
Brian Paul [Wed, 1 Nov 2006 19:25:19 +0000 (19:25 +0000)]
fix _mesa_select_tex_image() calls
Michal Krol [Wed, 1 Nov 2006 19:02:27 +0000 (19:02 +0000)]
Write back gl_FragDepth to span->array->z.
Brian Paul [Wed, 1 Nov 2006 18:51:43 +0000 (18:51 +0000)]
Don't use the x/y/width/height params passed to Clear(). Get them
after locking. Next: remove the params altogether.
Brian Paul [Wed, 1 Nov 2006 18:49:41 +0000 (18:49 +0000)]
disable debug printf