OSDN Git Service
Brian Paul [Wed, 29 Mar 2006 23:44:31 +0000 (23:44 +0000)]
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().
Brian Paul [Wed, 29 Mar 2006 23:42:44 +0000 (23:42 +0000)]
put braces around RENDER_SPAN macro when called, not when defined. Fixes -pedantic warnings in x11 driver
Brian Paul [Wed, 29 Mar 2006 23:20:49 +0000 (23:20 +0000)]
fix GETPROCADDRESS usage, remove carriage return chars (bug 6430)
Brian Paul [Wed, 29 Mar 2006 23:18:13 +0000 (23:18 +0000)]
s/glslnose.c/glslnoise/ (bug 6430)
Kristian Høgsberg [Wed, 29 Mar 2006 22:32:38 +0000 (22:32 +0000)]
Fixes to silence warnings in code generated by glapi scripts.
Karl Schultz [Wed, 29 Mar 2006 20:55:48 +0000 (20:55 +0000)]
Add newest source code files to project.
Brian Paul [Wed, 29 Mar 2006 18:54:00 +0000 (18:54 +0000)]
added some no-op virtual destructors to silence g++ 4.0.0 warnings
Brian Paul [Wed, 29 Mar 2006 18:46:46 +0000 (18:46 +0000)]
fixes from John Shell (bug 6339)
Brian Paul [Wed, 29 Mar 2006 18:41:19 +0000 (18:41 +0000)]
minor clean-up
Brian Paul [Wed, 29 Mar 2006 15:21:01 +0000 (15:21 +0000)]
FP textures and fixes (Ewald Snel)
Brian Paul [Wed, 29 Mar 2006 15:17:57 +0000 (15:17 +0000)]
fix components initialization in two places (Ewald Snel)
Brian Paul [Wed, 29 Mar 2006 15:15:37 +0000 (15:15 +0000)]
move NumNativeAlu/TexInstruction assignments (Ewald Snel)
Jouk Jansen [Wed, 29 Mar 2006 12:09:08 +0000 (12:09 +0000)]
Committing in .
Removing <CR>
Modified Files:
Mesa/src/mesa/main/fog.c Mesa/src/mesa/main/hint.c
Mesa/src/mesa/main/mtypes.h
----------------------------------------------------------------------
Brian Paul [Wed, 29 Mar 2006 04:53:02 +0000 (04:53 +0000)]
prep for 6.5 release
Brian Paul [Wed, 29 Mar 2006 04:51:03 +0000 (04:51 +0000)]
New code for rendering to depth/stencil textures.
Re-org of the renderbuffer wrapper code.
Brian Paul [Wed, 29 Mar 2006 04:48:21 +0000 (04:48 +0000)]
new tests for GL_DEPTH_STENCIL_EXT
Brian Paul [Wed, 29 Mar 2006 04:47:34 +0000 (04:47 +0000)]
a few new assertions
Karl Schultz [Wed, 29 Mar 2006 04:02:44 +0000 (04:02 +0000)]
Windows makefile to easily build all demo programs.
Karl Schultz [Wed, 29 Mar 2006 04:01:25 +0000 (04:01 +0000)]
Repair corrupted file and remove rogue 'test' project.
Brian Paul [Wed, 29 Mar 2006 04:01:05 +0000 (04:01 +0000)]
fix a GLuint vs GLushort test, new assertions
Brian Paul [Wed, 29 Mar 2006 03:59:34 +0000 (03:59 +0000)]
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.
Karl Schultz [Wed, 29 Mar 2006 03:42:32 +0000 (03:42 +0000)]
Undef a conflicting symbol in Windows.
Karl Schultz [Wed, 29 Mar 2006 03:41:38 +0000 (03:41 +0000)]
add showbuffer.[ch] which could be in this dir after the targets are built.
Karl Schultz [Wed, 29 Mar 2006 02:12:31 +0000 (02:12 +0000)]
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.
Karl Schultz [Wed, 29 Mar 2006 02:09:47 +0000 (02:09 +0000)]
Remove unneeded includes of time.h
Daniel Borca [Tue, 28 Mar 2006 21:40:14 +0000 (21:40 +0000)]
Match pixel addresses with `compute_row_addresses' in RGB mode (also obey RGB/UNSIGNED_BYTE rule).
Roland Scheidegger [Tue, 28 Mar 2006 17:22:57 +0000 (17:22 +0000)]
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).
Brian Paul [Tue, 28 Mar 2006 15:28:00 +0000 (15:28 +0000)]
updated comment about framebuffer's Visual field
Brian Paul [Tue, 28 Mar 2006 15:25:44 +0000 (15:25 +0000)]
added known issue: render to depth textures not working
Brian Paul [Tue, 28 Mar 2006 15:24:50 +0000 (15:24 +0000)]
update conditional for render to GL_DEPTH_STENCIL texture, check for valid teximage before calling ctx->Driver.RenderTexture()
Brian Paul [Tue, 28 Mar 2006 15:21:44 +0000 (15:21 +0000)]
a little code movement so we don't make invalid casts from gl_renderbuffers to xmesa_renderbuffers
Aapo Tahkola [Tue, 28 Mar 2006 10:26:34 +0000 (10:26 +0000)]
fix #6072 (Keith Whitwell)
Keith Whitwell [Tue, 28 Mar 2006 07:40:57 +0000 (07:40 +0000)]
Revert merge of new/experimental code from texmem branch.
Brian Paul [Tue, 28 Mar 2006 01:23:43 +0000 (01:23 +0000)]
enable GL_ARB_half_float_pixel, was GL_MESAX_half_float_pixel
Brian Paul [Tue, 28 Mar 2006 01:22:48 +0000 (01:22 +0000)]
comment about byteswapping in _mesa_unpack_depth_span()
Roland Scheidegger [Mon, 27 Mar 2006 23:53:53 +0000 (23:53 +0000)]
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.
Roland Scheidegger [Mon, 27 Mar 2006 23:34:53 +0000 (23:34 +0000)]
remove unnecessary typedefs causing compiler warnings
Daniel Borca [Mon, 27 Mar 2006 17:34:31 +0000 (17:34 +0000)]
Disable `hidden' attribute for DJGPP
Daniel Borca [Mon, 27 Mar 2006 17:32:22 +0000 (17:32 +0000)]
PutRowRGB was not initialized for OSMESA_RGB_565
Dave Airlie [Mon, 27 Mar 2006 00:07:21 +0000 (00:07 +0000)]
Fixup makefile for solo non-egl
Brian Paul [Sun, 26 Mar 2006 05:22:17 +0000 (05:22 +0000)]
merge from texman branch
Brian Paul [Sun, 26 Mar 2006 05:09:03 +0000 (05:09 +0000)]
fix some PFNGL* typedefs
Brian Paul [Sat, 25 Mar 2006 22:52:39 +0000 (22:52 +0000)]
remove carriage returns
Brian Paul [Sat, 25 Mar 2006 17:57:52 +0000 (17:57 +0000)]
fix issue in _mesa_free_framebuffer_data()
Brian Paul [Sat, 25 Mar 2006 16:16:37 +0000 (16:16 +0000)]
check for incomplete FBO in _mesa_Clear()
Brian Paul [Fri, 24 Mar 2006 23:53:50 +0000 (23:53 +0000)]
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.
Brian Paul [Fri, 24 Mar 2006 23:17:06 +0000 (23:17 +0000)]
lots of debug options, some code movement, etc
Brian Paul [Fri, 24 Mar 2006 22:53:00 +0000 (22:53 +0000)]
added some missing formats in _mesa_source/dest_buffer_exists()
Aapo Tahkola [Fri, 24 Mar 2006 16:35:08 +0000 (16:35 +0000)]
Make ARB_vp backends happy with nv arl
Aapo Tahkola [Fri, 24 Mar 2006 16:33:34 +0000 (16:33 +0000)]
secondary color fixes.
Brian Paul [Thu, 23 Mar 2006 17:17:23 +0000 (17:17 +0000)]
Added -l option for explicit locking around Xlib and GLX calls in
threaded code. Seems to improve reliability quite a bit.
Brian Paul [Thu, 23 Mar 2006 16:58:22 +0000 (16:58 +0000)]
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.
Dave Airlie [Thu, 23 Mar 2006 04:20:37 +0000 (04:20 +0000)]
make solo build complete
Dave Airlie [Thu, 23 Mar 2006 04:15:29 +0000 (04:15 +0000)]
fix coverity 1107: use after free
Dave Airlie [Thu, 23 Mar 2006 04:13:37 +0000 (04:13 +0000)]
fix coverity 926: use before NULL check
Brian Paul [Wed, 22 Mar 2006 22:02:07 +0000 (22:02 +0000)]
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.
Aapo Tahkola [Wed, 22 Mar 2006 21:29:27 +0000 (21:29 +0000)]
implement arl and enable hw nv_vp.
Aapo Tahkola [Wed, 22 Mar 2006 21:29:15 +0000 (21:29 +0000)]
ARL dst idx was undefined.
Brian Paul [Tue, 21 Mar 2006 21:57:00 +0000 (21:57 +0000)]
GL_EXT_packed_depth_stencil should be off by default
Michal Krol [Tue, 21 Mar 2006 10:59:14 +0000 (10:59 +0000)]
Silencium gcc warnings.
Michal Krol [Tue, 21 Mar 2006 10:37:40 +0000 (10:37 +0000)]
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;
Brian Paul [Mon, 20 Mar 2006 18:51:57 +0000 (18:51 +0000)]
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.
Brian Paul [Mon, 20 Mar 2006 15:27:55 +0000 (15:27 +0000)]
additional assertions and debug code for testing FBO completeness
Brian Paul [Mon, 20 Mar 2006 15:27:33 +0000 (15:27 +0000)]
additional error checking to be sure source renderbuffer exists for glCopyTex[Sub]Image()
Brian Paul [Mon, 20 Mar 2006 15:26:20 +0000 (15:26 +0000)]
use new _mesa_sourc/dest_buffer_exists() functions
Brian Paul [Mon, 20 Mar 2006 15:25:18 +0000 (15:25 +0000)]
added _mesa_source/dest_buffer_exists() function to easily test if particular renderbuffers are present
Brian Paul [Mon, 20 Mar 2006 15:20:57 +0000 (15:20 +0000)]
fix some buffer binding tests in _mesa_make_current()
Brian Paul [Mon, 20 Mar 2006 15:20:30 +0000 (15:20 +0000)]
slightly improved error message
Aapo Tahkola [Mon, 20 Mar 2006 13:37:28 +0000 (13:37 +0000)]
Fix texrect upload conflicts.
Aapo Tahkola [Sun, 19 Mar 2006 21:17:14 +0000 (21:17 +0000)]
Disable tnl programs when doing software vertex programs. compiz with its texrect and lighting needs was broken because of this.
Brian Paul [Sun, 19 Mar 2006 19:07:12 +0000 (19:07 +0000)]
minor clean-ups
Aapo Tahkola [Sun, 19 Mar 2006 18:04:12 +0000 (18:04 +0000)]
-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
Brian Paul [Sun, 19 Mar 2006 00:10:22 +0000 (00:10 +0000)]
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.
Brian Paul [Sat, 18 Mar 2006 21:46:17 +0000 (21:46 +0000)]
Don't call Driver->Bitmap() if no image to render
Jouk Jansen [Fri, 17 Mar 2006 14:38:41 +0000 (14:38 +0000)]
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
----------------------------------------------------------------------
Brian Paul [Fri, 17 Mar 2006 04:13:29 +0000 (04:13 +0000)]
Init FogCoordFuncs[0..5] too, remove some unneeded #includes
Brian Paul [Fri, 17 Mar 2006 04:10:03 +0000 (04:10 +0000)]
remove another test for IN_DRI_DRIVER
Kristian Høgsberg [Fri, 17 Mar 2006 00:03:20 +0000 (00:03 +0000)]
Don't use glx_ansic.h functions (__glXMemset).
Brian Paul [Thu, 16 Mar 2006 18:06:34 +0000 (18:06 +0000)]
added #undef GET_DISPATCH
Brian Paul [Thu, 16 Mar 2006 18:05:25 +0000 (18:05 +0000)]
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.
Brian Paul [Thu, 16 Mar 2006 04:44:00 +0000 (04:44 +0000)]
finish up some loose ends in _mesa_texstore_z24_s8()
Brian Paul [Wed, 15 Mar 2006 20:56:22 +0000 (20:56 +0000)]
assorted code clean-ups, comments, etc.
Brian Paul [Wed, 15 Mar 2006 20:42:00 +0000 (20:42 +0000)]
remove invalid assertion in _glapi_get_dispatch(), fixes additional thread safety problem
Brian Paul [Wed, 15 Mar 2006 20:31:50 +0000 (20:31 +0000)]
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.
Brian Paul [Wed, 15 Mar 2006 20:30:17 +0000 (20:30 +0000)]
updated some printfs, added comment about sched_yield
Brian Paul [Wed, 15 Mar 2006 17:48:00 +0000 (17:48 +0000)]
sync with texmem branch
Brian Paul [Wed, 15 Mar 2006 14:09:08 +0000 (14:09 +0000)]
rename enums, fixes compilation breakage (Michal Krol)
Brian Paul [Wed, 15 Mar 2006 01:44:03 +0000 (01:44 +0000)]
use 'p' key to toggle use of GL_EXT_packed_depth_stencil
Brian Paul [Wed, 15 Mar 2006 01:36:52 +0000 (01:36 +0000)]
s/GLuint/GLushort/ in read_depth_stencil_image()
Brian Paul [Tue, 14 Mar 2006 22:39:43 +0000 (22:39 +0000)]
init Red/Green/EtcBits = 0 in soft_renderbuffer_storage()
Brian Paul [Tue, 14 Mar 2006 15:41:53 +0000 (15:41 +0000)]
Set always_array=true for glGenProgramsNV (Dave Reveman)
Brian Paul [Tue, 14 Mar 2006 15:08:52 +0000 (15:08 +0000)]
replace dprintf() with _glu_dprintf() (bug 6244)
Michal Krol [Tue, 14 Mar 2006 11:39:58 +0000 (11:39 +0000)]
Add slang_analyse.c and slang_library_texsample.c.
Michal Krol [Tue, 14 Mar 2006 11:23:16 +0000 (11:23 +0000)]
More GLSL code:
- add texture sampling support;
- fix assembly codegen bugs;
Aapo Tahkola [Mon, 13 Mar 2006 20:40:46 +0000 (20:40 +0000)]
Clean build.
Aapo Tahkola [Mon, 13 Mar 2006 18:23:19 +0000 (18:23 +0000)]
Fix broken max mipmap leveling that was horribly wrong.
Aapo Tahkola [Fri, 10 Mar 2006 05:30:33 +0000 (05:30 +0000)]
Option to init vp temps(for testing)
Brian Paul [Thu, 9 Mar 2006 16:27:35 +0000 (16:27 +0000)]
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!!!
Brian Paul [Thu, 9 Mar 2006 16:25:46 +0000 (16:25 +0000)]
s/GLint/int/, to fit GLX conventions
Brian Paul [Thu, 9 Mar 2006 16:24:46 +0000 (16:24 +0000)]
Instead of adding extra flags to DEFINES with +=, define EXTRA_DEFINES instead.
This eliminates a bunch of duplication in the compilation commmands.