Keith Whitwell [Wed, 19 Jan 2005 12:09:33 +0000 (12:09 +0000)]
Bring the texcombine fixes to the trunk.
Keith Whitwell [Wed, 19 Jan 2005 12:06:17 +0000 (12:06 +0000)]
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.
Keith Whitwell [Wed, 19 Jan 2005 11:39:23 +0000 (11:39 +0000)]
Remove depend on make clean
Keith Whitwell [Wed, 19 Jan 2005 11:10:27 +0000 (11:10 +0000)]
Depend tweaks
Daniel Borca [Wed, 19 Jan 2005 07:57:52 +0000 (07:57 +0000)]
make sure we avoid assertion failure wrt VB->ColorPtr[1]->stride
Daniel Borca [Wed, 19 Jan 2005 07:52:49 +0000 (07:52 +0000)]
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.
Daniel Borca [Wed, 19 Jan 2005 07:43:13 +0000 (07:43 +0000)]
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.
Brian Paul [Tue, 18 Jan 2005 22:58:13 +0000 (22:58 +0000)]
minor reorg of shader files, disable building for now
Alan Hourihane [Tue, 18 Jan 2005 21:57:48 +0000 (21:57 +0000)]
remove some debug
Alan Hourihane [Tue, 18 Jan 2005 15:06:01 +0000 (15:06 +0000)]
Fix tristrips (which fixes coloredTexPerf2 & coloredLitPerf2 glean tests)
Michal Krol [Tue, 18 Jan 2005 14:21:50 +0000 (14:21 +0000)]
remove #ifndef linux, it isnt defined on Linux, where should I define it?
Michal Krol [Tue, 18 Jan 2005 14:19:46 +0000 (14:19 +0000)]
comment out _THROW calls, dont want to compile under Linux
Michal Krol [Tue, 18 Jan 2005 14:17:37 +0000 (14:17 +0000)]
add shader/slang/slang_mesa.cpp
Michal Krol [Tue, 18 Jan 2005 14:16:51 +0000 (14:16 +0000)]
change .cc suffix to .cpp
Michal Krol [Tue, 18 Jan 2005 14:02:52 +0000 (14:02 +0000)]
add slang preprocessor C sources; add slang include directories
Michal Krol [Tue, 18 Jan 2005 13:58:56 +0000 (13:58 +0000)]
fix // comments
Michal Krol [Tue, 18 Jan 2005 12:04:53 +0000 (12:04 +0000)]
fix MAX_VERTEX_ATTRIBS_ARB query
Keith Whitwell [Tue, 18 Jan 2005 08:41:55 +0000 (08:41 +0000)]
Fix calculation of last_count in _tnl_wrap_buffers()
Brian Paul [Mon, 17 Jan 2005 22:33:50 +0000 (22:33 +0000)]
added rule for compiling C++ sources
Michal Krol [Mon, 17 Jan 2005 16:25:08 +0000 (16:25 +0000)]
add slang/ directory tree
Brian Paul [Mon, 17 Jan 2005 16:16:35 +0000 (16:16 +0000)]
use FABSF(fogCoord) to fix fog calculation problem (Soju Matsumoto)
Brian Paul [Mon, 17 Jan 2005 16:14:46 +0000 (16:14 +0000)]
fix some weirdness accidentally checked in in the past
Michal Krol [Mon, 17 Jan 2005 16:01:49 +0000 (16:01 +0000)]
2005-oct-19 3dlabs slang compiler, tweaked a little bit
Michal Krol [Mon, 17 Jan 2005 15:52:20 +0000 (15:52 +0000)]
slang to mesa compatibility, tested only under Windows
Michal Krol [Mon, 17 Jan 2005 15:47:57 +0000 (15:47 +0000)]
add 3dlabs_shhandle interface
Michal Krol [Mon, 17 Jan 2005 15:35:46 +0000 (15:35 +0000)]
add [.slang] to INCDIR, fix comma in OBJECTS
Michal Krol [Mon, 17 Jan 2005 15:32:25 +0000 (15:32 +0000)]
add src/mesa/shader/slang to INCLUDE_DIRS
Daniel Borca [Mon, 17 Jan 2005 08:05:47 +0000 (08:05 +0000)]
cleaned up warnings
Daniel Borca [Mon, 17 Jan 2005 08:04:39 +0000 (08:04 +0000)]
allow more internalFormat/format combinations (i hope i got it right)
Daniel Borca [Mon, 17 Jan 2005 08:02:42 +0000 (08:02 +0000)]
fix compilation error for fx/Mesa
Daniel Borca [Mon, 17 Jan 2005 07:48:53 +0000 (07:48 +0000)]
since we've already messed up this one, let we do it further and make it look like a fire...
Daniel Borca [Mon, 17 Jan 2005 07:47:41 +0000 (07:47 +0000)]
remove trailing slash from TOP definition
Brian Paul [Mon, 17 Jan 2005 01:21:03 +0000 (01:21 +0000)]
silence warning
Brian Paul [Mon, 17 Jan 2005 01:07:00 +0000 (01:07 +0000)]
clean up gl2 structs
Brian Paul [Mon, 17 Jan 2005 01:02:40 +0000 (01:02 +0000)]
silence a bunch of warnings
Brian Paul [Mon, 17 Jan 2005 00:40:29 +0000 (00:40 +0000)]
fix a few warnings
Brian Paul [Sun, 16 Jan 2005 19:42:46 +0000 (19:42 +0000)]
added getstring.c
Brian Paul [Sun, 16 Jan 2005 19:40:15 +0000 (19:40 +0000)]
added a few OpenGL 2.0 tokens (temporary)
Brian Paul [Sun, 16 Jan 2005 19:39:10 +0000 (19:39 +0000)]
_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.
Brian Paul [Sun, 16 Jan 2005 17:59:50 +0000 (17:59 +0000)]
make tnl_clipspace_attr->insert field const, to silence warning
Aapo Tahkola [Sun, 16 Jan 2005 17:07:24 +0000 (17:07 +0000)]
This fixes it but why mipmaps still work?
It doesnt look like filter constants in r300_reg.h would define number of
levels.
Aapo Tahkola [Sun, 16 Jan 2005 16:12:05 +0000 (16:12 +0000)]
I was wrong...
Aapo Tahkola [Sun, 16 Jan 2005 13:28:49 +0000 (13:28 +0000)]
Looks like masking masking t->filter isnt needed anymore.
texwrap still shows some problems with clamp mode with nearest filtering.
Felix Kuehling [Sun, 16 Jan 2005 01:28:26 +0000 (01:28 +0000)]
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.
Vladimir Dergachev [Sat, 15 Jan 2005 20:44:23 +0000 (20:44 +0000)]
On the way to getting stencil working.
Vladimir Dergachev [Sat, 15 Jan 2005 19:33:19 +0000 (19:33 +0000)]
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.
Felix Kuehling [Sat, 15 Jan 2005 14:37:33 +0000 (14:37 +0000)]
Converted to use spantmp2.h.
Felix Kuehling [Sat, 15 Jan 2005 14:35:35 +0000 (14:35 +0000)]
Use HW_READ_LOCK and HW_READ_UNLOCK in assembler-optimized span read
functions.
Vladimir Dergachev [Sat, 15 Jan 2005 04:17:27 +0000 (04:17 +0000)]
Use symbolic constants to describe pixel shader ALU instructions.
Aapo Tahkola [Fri, 14 Jan 2005 21:53:00 +0000 (21:53 +0000)]
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 :)
Alan Hourihane [Fri, 14 Jan 2005 16:56:52 +0000 (16:56 +0000)]
Enable line stippling.
Keith Whitwell [Fri, 14 Jan 2005 15:03:00 +0000 (15:03 +0000)]
Fix previously un-noticed issue with flat-shaded points.
Alan Hourihane [Fri, 14 Jan 2005 13:11:34 +0000 (13:11 +0000)]
silence a warning
Alan Hourihane [Fri, 14 Jan 2005 13:10:50 +0000 (13:10 +0000)]
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.
Alan Hourihane [Fri, 14 Jan 2005 13:02:53 +0000 (13:02 +0000)]
16bpp doesn't support masked clears, so fallback when they're enabled.
Keith Whitwell [Fri, 14 Jan 2005 13:01:21 +0000 (13:01 +0000)]
Populate WriteMonoDepthSpan in 24/8 modes.
Daniel Borca [Fri, 14 Jan 2005 08:50:08 +0000 (08:50 +0000)]
changed coding style. made `glutTimerFunc' less accurate, but far more reliable.
Daniel Borca [Fri, 14 Jan 2005 08:44:29 +0000 (08:44 +0000)]
changed coding style. added possibility to use default timer instead of PC/HW timer.
Daniel Borca [Fri, 14 Jan 2005 08:40:43 +0000 (08:40 +0000)]
changed coding style. added a NULL pointer check.
Daniel Borca [Fri, 14 Jan 2005 08:37:20 +0000 (08:37 +0000)]
changed coding style
Daniel Borca [Fri, 14 Jan 2005 08:31:50 +0000 (08:31 +0000)]
doc update
Vladimir Dergachev [Fri, 14 Jan 2005 06:39:14 +0000 (06:39 +0000)]
Remove redundant register.
Hook up some functions in r300Enable().
Vladimir Dergachev [Fri, 14 Jan 2005 05:26:17 +0000 (05:26 +0000)]
Reduce amount of stderr output.
Switch to using R300_EASY_TX_FORMAT() macro everywhere.
Vladimir Dergachev [Fri, 14 Jan 2005 04:21:55 +0000 (04:21 +0000)]
Incorporate latest data from Wladimir van der Laan.
Vladimir Dergachev [Thu, 13 Jan 2005 23:13:52 +0000 (23:13 +0000)]
Sync with master copy.
Dave Airlie [Thu, 13 Jan 2005 22:38:21 +0000 (22:38 +0000)]
add -DUSE_EXTERNAL_DXTN_LIB=1 so compressed textures are enabled for solo
Alan Hourihane [Thu, 13 Jan 2005 17:53:01 +0000 (17:53 +0000)]
remove some dead texture code
Felix Kuehling [Thu, 13 Jan 2005 16:02:05 +0000 (16:02 +0000)]
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.
Keith Whitwell [Thu, 13 Jan 2005 15:58:05 +0000 (15:58 +0000)]
Fix loop for quads-as-triangles.
Keith Whitwell [Thu, 13 Jan 2005 15:49:39 +0000 (15:49 +0000)]
Rename via_fastrender_* to avoid confusion with similar functions in
via_render.c.
Keith Whitwell [Thu, 13 Jan 2005 14:57:34 +0000 (14:57 +0000)]
Simplify viaChooseVertexState slightly.
Keith Whitwell [Thu, 13 Jan 2005 14:54:44 +0000 (14:54 +0000)]
Remove misleading comment.
Keith Whitwell [Thu, 13 Jan 2005 14:52:24 +0000 (14:52 +0000)]
Typo
Keith Whitwell [Thu, 13 Jan 2005 14:38:17 +0000 (14:38 +0000)]
Emit constant colors for texunit 1 blending.
Change comments and some code to match naming used in the docs.
Michal Krol [Thu, 13 Jan 2005 14:15:36 +0000 (14:15 +0000)]
add s_atifragshader.c, s_atifragshader.h
Michal Krol [Thu, 13 Jan 2005 14:14:55 +0000 (14:14 +0000)]
3dlabs glslang frontend
Michal Krol [Thu, 13 Jan 2005 14:14:11 +0000 (14:14 +0000)]
3dlabs glslang frontend, not complete
Michal Krol [Thu, 13 Jan 2005 14:13:19 +0000 (14:13 +0000)]
cosmetic changes
Michal Krol [Thu, 13 Jan 2005 14:12:50 +0000 (14:12 +0000)]
implement ARB_shader_objects, not complete
Michal Krol [Thu, 13 Jan 2005 14:12:01 +0000 (14:12 +0000)]
add atifragshader.c, shaderobjects.c, shaderobjects_3dlabs.c, atifragshader.h,
shaderobjects.h, shaderobjects_3dlabs.h
Michal Krol [Thu, 13 Jan 2005 14:10:37 +0000 (14:10 +0000)]
add shaderobjects_3dlabs.c
Michal Krol [Thu, 13 Jan 2005 14:09:58 +0000 (14:09 +0000)]
add ARB_shader_objects interfaces, shared and context state
Michal Krol [Thu, 13 Jan 2005 14:09:18 +0000 (14:09 +0000)]
enable ARB_fragment/vertex_shader
Michal Krol [Thu, 13 Jan 2005 14:08:47 +0000 (14:08 +0000)]
init ARB_shader_objects subsystem
Michal Krol [Thu, 13 Jan 2005 14:08:00 +0000 (14:08 +0000)]
add shader/shaderobjects_3dlabs.c
Keith Whitwell [Thu, 13 Jan 2005 13:00:23 +0000 (13:00 +0000)]
cut out dead texture state code
Alan Hourihane [Thu, 13 Jan 2005 12:03:00 +0000 (12:03 +0000)]
revert some makecurrent code
Alan Hourihane [Thu, 13 Jan 2005 10:20:16 +0000 (10:20 +0000)]
Fix glean scissor test
Vladimir Dergachev [Thu, 13 Jan 2005 09:08:58 +0000 (09:08 +0000)]
Prevent "disabling 3D acceleration" message from printing - we do not define raster functions anyway.
Vladimir Dergachev [Thu, 13 Jan 2005 09:05:31 +0000 (09:05 +0000)]
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 ?
Alan Hourihane [Thu, 13 Jan 2005 00:15:28 +0000 (00:15 +0000)]
As we fallback for polygon stipple on the CLE266 for now, ensure we
don't turn on the polygon stipple hardware bit.
Alan Hourihane [Wed, 12 Jan 2005 23:16:28 +0000 (23:16 +0000)]
Use the faster span read/write template for 16bpp
Keith Whitwell [Wed, 12 Jan 2005 21:55:47 +0000 (21:55 +0000)]
Don't special-case 16bpp for colormask register - not needed.
Keith Whitwell [Wed, 12 Jan 2005 21:04:03 +0000 (21:04 +0000)]
Simplify usage of drmHash functions and fix bug in
__driGarbageCollectDrawables which would get confused while walking
the hash values.
Keith Whitwell [Wed, 12 Jan 2005 19:38:41 +0000 (19:38 +0000)]
free buffer in t_vertex_c.c on context delete
Keith Whitwell [Wed, 12 Jan 2005 19:27:49 +0000 (19:27 +0000)]
Remove bogus write to freed memory (valgrind).
Alan Hourihane [Wed, 12 Jan 2005 19:24:39 +0000 (19:24 +0000)]
Check for deletion of currently bound context
Other minor cleanups
Keith Whitwell [Wed, 12 Jan 2005 19:11:47 +0000 (19:11 +0000)]
new test to exercise context and window create/delete
Alan Hourihane [Wed, 12 Jan 2005 18:32:51 +0000 (18:32 +0000)]
Fixes lockups initializing AGP DMA.
Keith Whitwell [Wed, 12 Jan 2005 18:14:42 +0000 (18:14 +0000)]
Expand out the N(x) macro so that tags can find functions like
drmHashFirst(), etc.