OSDN Git Service

android-x86/external-mesa.git
19 years agoEmit constant colors for texunit 1 blending.
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.

19 years agoadd s_atifragshader.c, s_atifragshader.h
Michal Krol [Thu, 13 Jan 2005 14:15:36 +0000 (14:15 +0000)]
add s_atifragshader.c, s_atifragshader.h

19 years ago3dlabs glslang frontend
Michal Krol [Thu, 13 Jan 2005 14:14:55 +0000 (14:14 +0000)]
3dlabs glslang frontend

19 years ago3dlabs glslang frontend, not complete
Michal Krol [Thu, 13 Jan 2005 14:14:11 +0000 (14:14 +0000)]
3dlabs glslang frontend, not complete

19 years agocosmetic changes
Michal Krol [Thu, 13 Jan 2005 14:13:19 +0000 (14:13 +0000)]
cosmetic changes

19 years agoimplement ARB_shader_objects, not complete
Michal Krol [Thu, 13 Jan 2005 14:12:50 +0000 (14:12 +0000)]
implement ARB_shader_objects, not complete

19 years agoadd atifragshader.c, shaderobjects.c, shaderobjects_3dlabs.c, atifragshader.h,
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

19 years agoadd shaderobjects_3dlabs.c
Michal Krol [Thu, 13 Jan 2005 14:10:37 +0000 (14:10 +0000)]
add shaderobjects_3dlabs.c

19 years agoadd ARB_shader_objects interfaces, shared and context state
Michal Krol [Thu, 13 Jan 2005 14:09:58 +0000 (14:09 +0000)]
add ARB_shader_objects interfaces, shared and context state

19 years agoenable ARB_fragment/vertex_shader
Michal Krol [Thu, 13 Jan 2005 14:09:18 +0000 (14:09 +0000)]
enable ARB_fragment/vertex_shader

19 years agoinit ARB_shader_objects subsystem
Michal Krol [Thu, 13 Jan 2005 14:08:47 +0000 (14:08 +0000)]
init ARB_shader_objects subsystem

19 years agoadd shader/shaderobjects_3dlabs.c
Michal Krol [Thu, 13 Jan 2005 14:08:00 +0000 (14:08 +0000)]
add shader/shaderobjects_3dlabs.c

19 years agocut out dead texture state code
Keith Whitwell [Thu, 13 Jan 2005 13:00:23 +0000 (13:00 +0000)]
cut out dead texture state code

19 years agorevert some makecurrent code
Alan Hourihane [Thu, 13 Jan 2005 12:03:00 +0000 (12:03 +0000)]
revert some makecurrent code

19 years agoFix glean scissor test
Alan Hourihane [Thu, 13 Jan 2005 10:20:16 +0000 (10:20 +0000)]
Fix glean scissor test

19 years agoPrevent "disabling 3D acceleration" message from printing - we do not define raster...
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.

19 years agoIncorporate TX_FORMAT information contributed by Wladimir van der Laan.
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 ?

19 years agoAs we fallback for polygon stipple on the CLE266 for now, ensure we
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.

19 years agoUse the faster span read/write template for 16bpp
Alan Hourihane [Wed, 12 Jan 2005 23:16:28 +0000 (23:16 +0000)]
Use the faster span read/write template for 16bpp

19 years agoDon't special-case 16bpp for colormask register - not needed.
Keith Whitwell [Wed, 12 Jan 2005 21:55:47 +0000 (21:55 +0000)]
Don't special-case 16bpp for colormask register - not needed.

19 years agoSimplify usage of drmHash functions and fix bug in
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.

19 years agofree buffer in t_vertex_c.c on context delete
Keith Whitwell [Wed, 12 Jan 2005 19:38:41 +0000 (19:38 +0000)]
free buffer in t_vertex_c.c on context delete

19 years agoRemove bogus write to freed memory (valgrind).
Keith Whitwell [Wed, 12 Jan 2005 19:27:49 +0000 (19:27 +0000)]
Remove bogus write to freed memory (valgrind).

19 years agoCheck for deletion of currently bound context
Alan Hourihane [Wed, 12 Jan 2005 19:24:39 +0000 (19:24 +0000)]
Check for deletion of currently bound context
Other minor cleanups

19 years agonew test to exercise context and window create/delete
Keith Whitwell [Wed, 12 Jan 2005 19:11:47 +0000 (19:11 +0000)]
new test to exercise context and window create/delete

19 years agoFixes lockups initializing AGP DMA.
Alan Hourihane [Wed, 12 Jan 2005 18:32:51 +0000 (18:32 +0000)]
Fixes lockups initializing AGP DMA.

19 years agoExpand out the N(x) macro so that tags can find functions like
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.

19 years agobuild fixes and enable agp dma
Alan Hourihane [Wed, 12 Jan 2005 17:33:09 +0000 (17:33 +0000)]
build fixes and enable agp dma

19 years agoAdd flag to clear texture caches after texture upload.
Keith Whitwell [Wed, 12 Jan 2005 17:20:29 +0000 (17:20 +0000)]
Add flag to clear texture caches after texture upload.

19 years agoDon't emit HC_SubA_HSPXYOS on CLE266.
Keith Whitwell [Wed, 12 Jan 2005 17:20:08 +0000 (17:20 +0000)]
Don't emit HC_SubA_HSPXYOS on CLE266.

19 years agoAllow two GL primitives to be combined to one HW primitive
Keith Whitwell [Wed, 12 Jan 2005 13:33:27 +0000 (13:33 +0000)]
Allow two GL primitives to be combined to one HW primitive
if possible.

19 years agoFix multitexturing.
Alan Hourihane [Wed, 12 Jan 2005 12:45:42 +0000 (12:45 +0000)]
Fix multitexturing.
The multiarb test works now when disabling texunit0/1.

19 years agosome "safer" type-punning (gcc optimizes float moves with integer moves, anyway).
Daniel Borca [Wed, 12 Jan 2005 09:25:37 +0000 (09:25 +0000)]
some "safer" type-punning (gcc optimizes float moves with integer moves, anyway).

19 years agotemporary prototypes for OpenGL 2.0
Brian Paul [Wed, 12 Jan 2005 04:06:55 +0000 (04:06 +0000)]
temporary prototypes for OpenGL 2.0

19 years agoOpenGL 2.0 StencilFunc/Op/MaskSeparate functions
Brian Paul [Wed, 12 Jan 2005 04:01:54 +0000 (04:01 +0000)]
OpenGL 2.0 StencilFunc/Op/MaskSeparate functions

19 years agoSome initial work for OpenGL 2.0: glStencilFunc/Op/MaskSeparate() functions.
Brian Paul [Wed, 12 Jan 2005 04:01:08 +0000 (04:01 +0000)]
Some initial work for OpenGL 2.0: glStencilFunc/Op/MaskSeparate() functions.

19 years agoAdded a couple missing proxy types.
Ian Romanick [Tue, 11 Jan 2005 23:50:01 +0000 (23:50 +0000)]
Added a couple missing proxy types.

19 years agoMipmapping and other texture filters now work.
Aapo Tahkola [Tue, 11 Jan 2005 23:34:55 +0000 (23:34 +0000)]
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.

19 years agoPut quotes around the CC and CXX variables passed to mklib. This make
Ian Romanick [Tue, 11 Jan 2005 22:43:45 +0000 (22:43 +0000)]
Put quotes around the CC and CXX variables passed to mklib.  This make
them work with multi-work compiler names (e.g., "ccache gcc").

19 years agofix a typo
Alan Hourihane [Tue, 11 Jan 2005 18:43:21 +0000 (18:43 +0000)]
fix a typo

19 years agoDisable bogus pbuffer code (though this could be revived with a little
Keith Whitwell [Tue, 11 Jan 2005 17:12:48 +0000 (17:12 +0000)]
Disable bogus pbuffer code (though this could be revived with a little
attention).
Correctly advertise FBConfigs with GL_BGRA rather than GL_BGR.

19 years agoFix the calculation of the alpha reference value which negates the
Alan Hourihane [Tue, 11 Jan 2005 17:09:47 +0000 (17:09 +0000)]
Fix the calculation of the alpha reference value which negates the
need for the big nasty fallback - so I've commented out that code.

19 years agoTemporarily disable pageflipping assert.
Keith Whitwell [Tue, 11 Jan 2005 17:06:09 +0000 (17:06 +0000)]
Temporarily disable pageflipping assert.

19 years agouncomment
Alan Hourihane [Tue, 11 Jan 2005 16:44:18 +0000 (16:44 +0000)]
uncomment

19 years agoFix ColorMask
Alan Hourihane [Tue, 11 Jan 2005 16:42:56 +0000 (16:42 +0000)]
Fix ColorMask

19 years agoprototype _mesa_init_ati_fragment_shader()
Brian Paul [Tue, 11 Jan 2005 15:56:47 +0000 (15:56 +0000)]
prototype _mesa_init_ati_fragment_shader()

19 years agoaliasing was broken
Michal Krol [Tue, 11 Jan 2005 15:47:16 +0000 (15:47 +0000)]
aliasing was broken

19 years agoAdd a big nasty fallback for AlphaTest -- seems to always be wrong
Keith Whitwell [Tue, 11 Jan 2005 15:40:06 +0000 (15:40 +0000)]
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.

19 years agofallback on polygon.stippleflag (thanks Keith)
Alan Hourihane [Tue, 11 Jan 2005 15:24:24 +0000 (15:24 +0000)]
fallback on polygon.stippleflag (thanks Keith)

19 years agoVMS updates from Jouk Jansen
Brian Paul [Tue, 11 Jan 2005 15:23:08 +0000 (15:23 +0000)]
VMS updates from Jouk Jansen

19 years agoapplied Keith's patch for "safe" type-punning.
Daniel Borca [Tue, 11 Jan 2005 10:56:39 +0000 (10:56 +0000)]
applied Keith's patch for "safe" type-punning.
made IS_NEGATIVE produce a boolean (useful when xoring with other booleans).

19 years agoFix usage of texture units, when TEX1 is enabled, but not TEX0.
Alan Hourihane [Tue, 11 Jan 2005 09:52:10 +0000 (09:52 +0000)]
Fix usage of texture units, when TEX1 is enabled, but not TEX0.

19 years agoGet NeHe lesson08 to work. Note: it appears the filtering does not work properly...
Vladimir Dergachev [Tue, 11 Jan 2005 06:22:55 +0000 (06:22 +0000)]
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.

19 years agoSwitch back to using immediate mode code - use of AGP space is interfering with textu...
Vladimir Dergachev [Tue, 11 Jan 2005 05:59:07 +0000 (05:59 +0000)]
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.

19 years agoMove the few definitions from r300_lib.h still in use to r300_emit.h.
Vladimir Dergachev [Tue, 11 Jan 2005 04:11:05 +0000 (04:11 +0000)]
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].

19 years agoSwitch r300_state.c to use r300_fixed_pipelines.h instead of r300_lib.h.
Vladimir Dergachev [Tue, 11 Jan 2005 03:55:04 +0000 (03:55 +0000)]
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.

19 years agoCopy sample pixel and vertex shaders to r300_fixed_pipelines.h
Vladimir Dergachev [Tue, 11 Jan 2005 03:50:04 +0000 (03:50 +0000)]
Copy sample pixel and vertex shaders to r300_fixed_pipelines.h

19 years agoremove a debug line
Brian Paul [Mon, 10 Jan 2005 23:16:49 +0000 (23:16 +0000)]
remove a debug line

19 years agotweak output formattting, fixed uninitialized var error
Brian Paul [Mon, 10 Jan 2005 23:15:59 +0000 (23:15 +0000)]
tweak output formattting, fixed uninitialized var error

19 years agoFixes to cope with the lack of AGP textures. This is all that's needed
Felix Kuehling [Mon, 10 Jan 2005 22:49:00 +0000 (22:49 +0000)]
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.

19 years agoFallback on PolygonStipple for CLE266 hardware.
Alan Hourihane [Mon, 10 Jan 2005 19:44:59 +0000 (19:44 +0000)]
Fallback on PolygonStipple for CLE266 hardware.
Only upload stencil configuration when a stencil buffer exists.

19 years agoWindows/ReactOS patch (Gregor Anich)
Brian Paul [Mon, 10 Jan 2005 16:23:21 +0000 (16:23 +0000)]
Windows/ReactOS patch (Gregor Anich)

19 years agoMore changes to cope with color stride == 0
Keith Whitwell [Mon, 10 Jan 2005 14:36:25 +0000 (14:36 +0000)]
More changes to cope with color stride == 0

19 years agoFix segfault in pipes by dealing with stride == 0 case in generic_interp_extras
Keith Whitwell [Mon, 10 Jan 2005 12:30:08 +0000 (12:30 +0000)]
Fix segfault in pipes by dealing with stride == 0 case in generic_interp_extras

19 years agoBring vertex buffer code up to date..
Vladimir Dergachev [Mon, 10 Jan 2005 05:24:28 +0000 (05:24 +0000)]
Bring vertex buffer code up to date..

19 years agoFor some reason we need r300Flush when using textures. Perhaps the problem is
Vladimir Dergachev [Mon, 10 Jan 2005 03:42:50 +0000 (03:42 +0000)]
For some reason we need r300Flush when using textures. Perhaps the problem is
with BITBLT_MULTI call ?

19 years agoClean up the code and make it unnecessary to issue extra calls to Setup*Shaders
Vladimir Dergachev [Mon, 10 Jan 2005 03:22:54 +0000 (03:22 +0000)]
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.

19 years agoPort EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c.
Vladimir Dergachev [Sun, 9 Jan 2005 23:37:03 +0000 (23:37 +0000)]
Port EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c.

19 years agoImplement a more elaborate hashing scheme for texture formats. Still not perfect.
Vladimir Dergachev [Sun, 9 Jan 2005 22:38:53 +0000 (22:38 +0000)]
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.

19 years agominor readtex fixes
Brian Paul [Sun, 9 Jan 2005 18:05:02 +0000 (18:05 +0000)]
minor readtex fixes

19 years agoimproved animation rate
Brian Paul [Sun, 9 Jan 2005 18:00:49 +0000 (18:00 +0000)]
improved animation rate

19 years agorotate at fixed rate, changed fire effect (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:52:48 +0000 (17:52 +0000)]
rotate at fixed rate, changed fire effect (Marcelo Magallon)

19 years agorotate at fixed rate (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:50:27 +0000 (17:50 +0000)]
rotate at fixed rate (Marcelo Magallon)

19 years agouse #ifdef to test for extension
Brian Paul [Sun, 9 Jan 2005 17:39:36 +0000 (17:39 +0000)]
use #ifdef to test for extension

19 years agoinclude readtex.h
Brian Paul [Sun, 9 Jan 2005 17:39:06 +0000 (17:39 +0000)]
include readtex.h

19 years agobetter animate rate (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:37:50 +0000 (17:37 +0000)]
better animate rate (Marcelo Magallon)

19 years agosome new/improved rules
Brian Paul [Sun, 9 Jan 2005 17:26:08 +0000 (17:26 +0000)]
some new/improved rules

19 years agoinclude readtex.h instead of readtex.c
Brian Paul [Sun, 9 Jan 2005 17:15:41 +0000 (17:15 +0000)]
include readtex.h instead of readtex.c

19 years agoinclude readtex.h instead of readtex.c (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 17:06:22 +0000 (17:06 +0000)]
include readtex.h instead of readtex.c (Marcello Magallon)

19 years agoAdd #ifdefs for extension testing (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 17:00:57 +0000 (17:00 +0000)]
Add #ifdefs for extension testing (Marcello Magallon)

19 years agoanimation rate patch (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 16:52:53 +0000 (16:52 +0000)]
animation rate patch (Marcello Magallon)

19 years agorotate at a reasonable rate
Brian Paul [Sun, 9 Jan 2005 16:48:52 +0000 (16:48 +0000)]
rotate at a reasonable rate

19 years agocompute reasonable animate rate (Marcelo Magallon)
Brian Paul [Sat, 8 Jan 2005 23:52:01 +0000 (23:52 +0000)]
compute reasonable animate rate (Marcelo Magallon)

19 years agofix-up rules for sphere demo, which uses readtex utility
Brian Paul [Sat, 8 Jan 2005 23:51:50 +0000 (23:51 +0000)]
fix-up rules for sphere demo, which uses readtex utility

19 years ago* Flush and wait in per-primitive fallback functions. Fixes flickering
Felix Kuehling [Sat, 8 Jan 2005 23:39:19 +0000 (23:39 +0000)]
* 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.

19 years agoAdded missing break; to fix infinite recursion between choose_emit_func
Felix Kuehling [Sat, 8 Jan 2005 15:51:11 +0000 (15:51 +0000)]
Added missing break; to fix infinite recursion between choose_emit_func
and emit_viewport4_bgra4_st2_st2.

19 years agoAdded state debugging option (SAVAGE_DEBUG=state).
Felix Kuehling [Sat, 8 Jan 2005 15:03:25 +0000 (15:03 +0000)]
Added state debugging option (SAVAGE_DEBUG=state).
Fixed: Use savageEmitChangedRegs instead of savageEmitContiguousRegs for
emitting Savage4.

19 years agoEnable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet).
Adam Jackson [Sat, 8 Jan 2005 03:54:38 +0000 (03:54 +0000)]
Enable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet).

19 years agoParallel build fix. Multiword variables on the target side of a : get
Adam Jackson [Sat, 8 Jan 2005 03:16:04 +0000 (03:16 +0000)]
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.

19 years agoAdd t_vb_cull.c (Bernard Blackham)
Keith Whitwell [Fri, 7 Jan 2005 18:35:28 +0000 (18:35 +0000)]
Add t_vb_cull.c (Bernard Blackham)

19 years agoAnd fix the obvious bugs in higher-numbered templates.
Keith Whitwell [Fri, 7 Jan 2005 16:43:39 +0000 (16:43 +0000)]
And fix the obvious bugs in higher-numbered templates.

19 years agoTemplatize the fastpaths.
Keith Whitwell [Fri, 7 Jan 2005 16:25:40 +0000 (16:25 +0000)]
Templatize the fastpaths.

19 years agoAdd some more hardcoded fastpaths.
Keith Whitwell [Fri, 7 Jan 2005 15:54:48 +0000 (15:54 +0000)]
Add some more hardcoded fastpaths.

19 years agoCope with the possibility that incoming vectors may have
Keith Whitwell [Fri, 7 Jan 2005 15:27:41 +0000 (15:27 +0000)]
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.

19 years agoUse the 'to' vector to determine the loop count.
Keith Whitwell [Fri, 7 Jan 2005 15:26:02 +0000 (15:26 +0000)]
Use the 'to' vector to determine the loop count.

19 years agoRemove -C flags for install which aren't universally supported.
Keith Whitwell [Fri, 7 Jan 2005 15:24:59 +0000 (15:24 +0000)]
Remove -C flags for install which aren't universally supported.

19 years agoFixed: ptex drawing functions were overridden with standard drawing
Felix Kuehling [Fri, 7 Jan 2005 10:55:13 +0000 (10:55 +0000)]
Fixed: ptex drawing functions were overridden with standard drawing
functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set.

19 years agoAdd a clean target to remove generated files.
Keith Whitwell [Fri, 7 Jan 2005 10:36:14 +0000 (10:36 +0000)]
Add a clean target to remove generated files.

19 years agoAdd a noop install target
Keith Whitwell [Fri, 7 Jan 2005 10:35:51 +0000 (10:35 +0000)]
Add a noop install target

19 years agoImprove the semantics of the 'install' target to make sure the right
Keith Whitwell [Fri, 7 Jan 2005 10:35:23 +0000 (10:35 +0000)]
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.