Brian Paul [Fri, 20 Apr 2001 22:51:55 +0000 (22:51 +0000)]
compilation fixes - texturing isn't working at this time
Brian Paul [Fri, 20 Apr 2001 19:21:41 +0000 (19:21 +0000)]
Minor fixes for Win32 (Karl Schultz).
Brian Paul [Fri, 20 Apr 2001 17:16:52 +0000 (17:16 +0000)]
improved a glBindTexture error message
Brian Paul [Fri, 20 Apr 2001 16:46:04 +0000 (16:46 +0000)]
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
Brian Paul [Fri, 20 Apr 2001 02:34:12 +0000 (02:34 +0000)]
check-in of old updates
Brian Paul [Thu, 19 Apr 2001 22:40:45 +0000 (22:40 +0000)]
removed glext.h hacks
Brian Paul [Thu, 19 Apr 2001 22:39:50 +0000 (22:39 +0000)]
bug fixes, added missing state query cases
Brian Paul [Thu, 19 Apr 2001 22:34:05 +0000 (22:34 +0000)]
added GL_ARB_texture_env_combine GL_ARB_texture_env_dot3 GL_ARB_texture_border_clamp (temporary until SGI updates this file)
Brian Paul [Thu, 19 Apr 2001 22:33:03 +0000 (22:33 +0000)]
added SecondaryColor functions
Keith Whitwell [Thu, 19 Apr 2001 13:12:40 +0000 (13:12 +0000)]
Add more options, including '-10','-100' and '-1000' to limit nr of vertices.
Keith Whitwell [Thu, 19 Apr 2001 12:23:07 +0000 (12:23 +0000)]
Remove values from VB->importable_data as those arrays are removed
from the VB.
Keith Whitwell [Thu, 19 Apr 2001 12:22:09 +0000 (12:22 +0000)]
Fix striding of color material inputs. (Fixes glean colorLitPerf)
Brian Paul [Tue, 17 Apr 2001 22:08:28 +0000 (22:08 +0000)]
minor optimization to dot3 computation
Brian Paul [Tue, 17 Apr 2001 21:25:53 +0000 (21:25 +0000)]
Fixed a number of minor GL_ARB_texture_env_combine/dot3 issues.
Brian Paul [Tue, 17 Apr 2001 21:08:32 +0000 (21:08 +0000)]
another fix in import_texcoord()
Brian Paul [Tue, 17 Apr 2001 20:37:44 +0000 (20:37 +0000)]
replaced ac->count with ac->count - ac->start in import_texcoord(), as in the other import functions
Brian Paul [Tue, 17 Apr 2001 17:01:33 +0000 (17:01 +0000)]
fixed mis-ordered args to _math_trans_4f() in _tnl_fill_immediate_drawarrays()
Brian Paul [Mon, 16 Apr 2001 21:07:33 +0000 (21:07 +0000)]
return hex string for unknown tokens in _mesa_lookup_enum_by_nr()
Brian Paul [Mon, 16 Apr 2001 21:06:54 +0000 (21:06 +0000)]
added missing 'break' in _mesa_TexEnvfv(), better error messages
Brian Paul [Fri, 13 Apr 2001 00:13:51 +0000 (00:13 +0000)]
added a work-around in _swrast_copy_texsubimage[123]d() to fix alpha channel problem in some DRI drivers (see comments)
Brian Paul [Thu, 12 Apr 2001 20:50:26 +0000 (20:50 +0000)]
b-key toggles between textures w/ and w/out border
Brian Paul [Thu, 12 Apr 2001 15:18:07 +0000 (15:18 +0000)]
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.
Brian Paul [Wed, 11 Apr 2001 23:22:20 +0000 (23:22 +0000)]
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.
Brian Paul [Tue, 10 Apr 2001 15:46:51 +0000 (15:46 +0000)]
fixed some divide by zero conformance problems
Brian Paul [Tue, 10 Apr 2001 15:25:45 +0000 (15:25 +0000)]
Added IROUND_POS() macro to mmath.h and use where appropriate. (Klaus Niederkrueger)
Alan Hourihane [Mon, 9 Apr 2001 15:41:11 +0000 (15:41 +0000)]
remove a HAVE_ELTS that I'd stuck before.
Keith Whitwell [Mon, 9 Apr 2001 14:47:34 +0000 (14:47 +0000)]
Perform fixup on material values
Alan Hourihane [Mon, 9 Apr 2001 10:16:01 +0000 (10:16 +0000)]
fix use of projected vertices with notex vertices when DO_PTEX isn't set.
Alan Hourihane [Sat, 7 Apr 2001 16:16:58 +0000 (16:16 +0000)]
Add quad and quad_strip
Alan Hourihane [Fri, 6 Apr 2001 16:26:41 +0000 (16:26 +0000)]
add FINISH function at end of each render_* function
fix typo.
Brian Paul [Wed, 4 Apr 2001 23:56:33 +0000 (23:56 +0000)]
replaced IntFormat GL_BGRA with GL_RGBA, fixes problems calling _mesa_base_texture_format()
Brian Paul [Wed, 4 Apr 2001 23:22:38 +0000 (23:22 +0000)]
GL_INTENSITY case was incorrect in extract_float_rgba()
Brian Paul [Wed, 4 Apr 2001 22:41:23 +0000 (22:41 +0000)]
fixed tmpTexelSize computation bug
Brian Paul [Wed, 4 Apr 2001 21:54:20 +0000 (21:54 +0000)]
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.
Brian Paul [Wed, 4 Apr 2001 13:38:51 +0000 (13:38 +0000)]
Updated bug report info in _mesa_problem()
Jouk Jansen [Wed, 4 Apr 2001 12:02:12 +0000 (12:02 +0000)]
Committing in .
Modified Files:
Mesa/src/descrip.mms
Removed glapinoop
----------------------------------------------------------------------
Brian Paul [Tue, 3 Apr 2001 17:35:54 +0000 (17:35 +0000)]
another fix to clear_32bit_ximage()
Brian Paul [Tue, 3 Apr 2001 16:32:29 +0000 (16:32 +0000)]
include fxdrv.h before other headers (Ivan Kalvatchev)
Brian Paul [Tue, 3 Apr 2001 16:25:54 +0000 (16:25 +0000)]
fixed wglUseFontBitmapsA() bugs (Frank Warmerdam)
Brian Paul [Tue, 3 Apr 2001 16:19:54 +0000 (16:19 +0000)]
clear pixel value wasn't byteswapped for scissored clears in clear_32bit_ximage()
Brian Paul [Mon, 2 Apr 2001 22:45:07 +0000 (22:45 +0000)]
applied David's patch for parsing display's server:screen string
Brian Paul [Fri, 30 Mar 2001 21:14:30 +0000 (21:14 +0000)]
querying proxy texture image info was segfaulting because of NULL TexFormat pointer
Brian Paul [Fri, 30 Mar 2001 21:12:15 +0000 (21:12 +0000)]
add texture border width to x/y/zoffset in gl[Copy]TexSubImage*D() functions to accomodate negative offsets correctly
Brian Paul [Fri, 30 Mar 2001 15:31:44 +0000 (15:31 +0000)]
texImage->FetchTexel wasn't getting initialized in _mesa_CopyTexImage1/2D()
Brian Paul [Fri, 30 Mar 2001 15:16:12 +0000 (15:16 +0000)]
fixed compilation problems related to ctx->_Enabled removal
Gareth Hughes [Fri, 30 Mar 2001 14:44:43 +0000 (14:44 +0000)]
Remove all traces of CULL_MASK_ACTIVE.
Keith Whitwell [Fri, 30 Mar 2001 00:39:02 +0000 (00:39 +0000)]
Fix calculation of fog coordinate in translate_vertex().
Keith Whitwell [Thu, 29 Mar 2001 21:16:25 +0000 (21:16 +0000)]
Remove ENABLE_* flags, ctx->_Enabled.
Replace with ctx->Texture._TexMatEnabled, ctx->Texture._TexGenEnabled.
Brian Paul [Thu, 29 Mar 2001 17:15:21 +0000 (17:15 +0000)]
silence a compiler warning
Keith Whitwell [Thu, 29 Mar 2001 17:08:26 +0000 (17:08 +0000)]
Removed DD_STENCIL, DD_FEEDBACK, DD_SELECT.
Added some switchable debug to s_context.c
Brian Paul [Thu, 29 Mar 2001 16:50:31 +0000 (16:50 +0000)]
Removed DD_Z_NEVER.
Replaced SEPERATE with SEPARATE.
Renumbered _NEW_ flags.
Removed _NEW_COLORTABLE.
Gareth Hughes [Thu, 29 Mar 2001 06:46:15 +0000 (06:46 +0000)]
Consolidation of asm code in 3.5
Gareth Hughes [Thu, 29 Mar 2001 03:41:39 +0000 (03:41 +0000)]
Make generation of matypes.h more transparent.
Gareth Hughes [Thu, 29 Mar 2001 03:14:48 +0000 (03:14 +0000)]
Add missing GEN_SOURCES definitions.
Brian Paul [Wed, 28 Mar 2001 21:39:49 +0000 (21:39 +0000)]
compilation updates
Brian Paul [Wed, 28 Mar 2001 21:37:24 +0000 (21:37 +0000)]
adjustment to coverage sample positions
Gareth Hughes [Wed, 28 Mar 2001 21:36:31 +0000 (21:36 +0000)]
- Restore texImage->IntFormat.
- Fix FX driver texture image conversions.
Brian Paul [Wed, 28 Mar 2001 21:36:31 +0000 (21:36 +0000)]
check for startX off the right edge of the window
Brian Paul [Wed, 28 Mar 2001 21:31:54 +0000 (21:31 +0000)]
use Image[i]->TexFormat to check for mipmap consistency
Brian Paul [Wed, 28 Mar 2001 21:31:24 +0000 (21:31 +0000)]
simplify test for specific texture formats
Gareth Hughes [Wed, 28 Mar 2001 20:44:43 +0000 (20:44 +0000)]
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.
Gareth Hughes [Wed, 28 Mar 2001 20:40:51 +0000 (20:40 +0000)]
More texture format updates. Drivers now need only plug an appropriate
format into texImage->TexFormat, the rest is handled by core Mesa.
Gareth Hughes [Wed, 28 Mar 2001 20:25:14 +0000 (20:25 +0000)]
More informative display of texture parameters.
Gareth Hughes [Wed, 28 Mar 2001 20:17:55 +0000 (20:17 +0000)]
Delete libGLU.so* from ../lib before installing it.
Brian Paul [Wed, 28 Mar 2001 17:39:12 +0000 (17:39 +0000)]
removed a debug message
Brian Paul [Wed, 28 Mar 2001 17:22:11 +0000 (17:22 +0000)]
remove TEST_L and JZ instructions; always jump through the _glapi_Dispatch pointer
Brian Paul [Wed, 28 Mar 2001 17:19:58 +0000 (17:19 +0000)]
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.
Brian Paul [Tue, 27 Mar 2001 20:32:24 +0000 (20:32 +0000)]
pass dst and src to CONVERT_TEXEL() macros to fix non-ANSI problems
Brian Paul [Tue, 27 Mar 2001 20:26:37 +0000 (20:26 +0000)]
fixed RGBA/RGB typo
Brian Paul [Tue, 27 Mar 2001 20:26:10 +0000 (20:26 +0000)]
texFormat was a random value in _mesa_store_teximage3d(), fix by undoing last changes
Gareth Hughes [Tue, 27 Mar 2001 19:18:02 +0000 (19:18 +0000)]
Updates required for DRI drivers on mesa-3-5-branch.
Brian Paul [Tue, 27 Mar 2001 17:44:35 +0000 (17:44 +0000)]
added rules for readtex.c and readtex.h
Brian Paul [Tue, 27 Mar 2001 17:38:28 +0000 (17:38 +0000)]
double buffer by default. if drawSmooth, use 50% alpha at top of polygon
Brian Paul [Tue, 27 Mar 2001 17:35:26 +0000 (17:35 +0000)]
set initial window pos
Brian Paul [Tue, 27 Mar 2001 17:30:51 +0000 (17:30 +0000)]
clean-up of tunnel demos
Brian Paul [Tue, 27 Mar 2001 17:08:20 +0000 (17:08 +0000)]
moved shadow code into teapot.c
Brian Paul [Tue, 27 Mar 2001 16:42:37 +0000 (16:42 +0000)]
silence compiler warnings
Brian Paul [Mon, 26 Mar 2001 23:36:51 +0000 (23:36 +0000)]
removed DO_GEOMETRY
Brian Paul [Mon, 26 Mar 2001 20:02:38 +0000 (20:02 +0000)]
change glTexImage3D() internalFormat to GLenum to match other OpenGLs
Brian Paul [Mon, 26 Mar 2001 19:45:57 +0000 (19:45 +0000)]
test texture wrap modes
Brian Paul [Mon, 26 Mar 2001 19:42:40 +0000 (19:42 +0000)]
added GL_ARB_texture_border_clamp
Gareth Hughes [Sat, 24 Mar 2001 06:01:27 +0000 (06:01 +0000)]
- Minor cleanups of ctx->Driver.Current*Primitive usage.
- Remove unused gl_reduce_prim array.
Gareth Hughes [Sat, 24 Mar 2001 05:23:46 +0000 (05:23 +0000)]
Fix ASSERT_OUTSIDE_SAVE_BEGIN_END() macro as well.
Brian Paul [Fri, 23 Mar 2001 22:48:35 +0000 (22:48 +0000)]
added glxgears
Brian Paul [Fri, 23 Mar 2001 22:46:26 +0000 (22:46 +0000)]
gears using GLX instead of GLUT
Brian Paul [Fri, 23 Mar 2001 21:41:44 +0000 (21:41 +0000)]
added silly mesa_hack() function and -b option
Brian Paul [Fri, 23 Mar 2001 21:37:05 +0000 (21:37 +0000)]
minor tweak to visual setup for accum buffers
Brian Paul [Fri, 23 Mar 2001 18:53:26 +0000 (18:53 +0000)]
fixed Min/Max lod clamp bug
Gareth Hughes [Fri, 23 Mar 2001 06:07:31 +0000 (06:07 +0000)]
Some more minor cleanups of macros.
Gareth Hughes [Fri, 23 Mar 2001 06:01:03 +0000 (06:01 +0000)]
Remove compiler warnings about ASSERT_OUTSIDE_BEGIN_END() macro.
Gareth Hughes [Thu, 22 Mar 2001 15:24:15 +0000 (15:24 +0000)]
Initial demo of GL_EXT_texture_filter_anisotropic extension.
Brian Paul [Thu, 22 Mar 2001 14:42:24 +0000 (14:42 +0000)]
enable GL_ARB_texture_env_combine and GL_ARB_texture_env_dot3 in _mesa_enable_sw_extensions()
Jouk Jansen [Thu, 22 Mar 2001 11:41:40 +0000 (11:41 +0000)]
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.
----------------------------------------------------------------------
Jouk Jansen [Thu, 22 Mar 2001 11:38:36 +0000 (11:38 +0000)]
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.
----------------------------------------------------------------------
Gareth Hughes [Thu, 22 Mar 2001 06:26:18 +0000 (06:26 +0000)]
Remove formats that no longer exist.
Gareth Hughes [Thu, 22 Mar 2001 06:25:23 +0000 (06:25 +0000)]
Minor updates.
Gareth Hughes [Thu, 22 Mar 2001 06:23:56 +0000 (06:23 +0000)]
Fix texture format enum values (Brian Paul).
Brian Paul [Thu, 22 Mar 2001 04:57:09 +0000 (04:57 +0000)]
added GL_ARB_texture_env_dot3 enums
Brian Paul [Thu, 22 Mar 2001 04:56:50 +0000 (04:56 +0000)]
minor comment update
Brian Paul [Thu, 22 Mar 2001 04:54:58 +0000 (04:54 +0000)]
added GL_ARB_texture_env_combine, GL_ARB_texture_env_dot3