mesa.git
17 years agor300: Removed unused aos_reg variable.
Oliver McFadden [Sat, 26 May 2007 19:39:35 +0000 (19:39 +0000)]
r300: Removed unused aos_reg variable.

17 years agor300: Use "rmesa" not "r300" in r300_emit.c; some of the macros require "rmesa".
Oliver McFadden [Sat, 26 May 2007 17:55:30 +0000 (17:55 +0000)]
r300: Use "rmesa" not "r300" in r300_emit.c; some of the macros require "rmesa".

17 years agor300: Cleaned up the non-TCL RENDERINPUTS, etc.
Oliver McFadden [Sat, 26 May 2007 17:36:08 +0000 (17:36 +0000)]
r300: Cleaned up the non-TCL RENDERINPUTS, etc.

17 years agor300: Whitespace cleanup in r300_emit.c.
Oliver McFadden [Sat, 26 May 2007 17:13:57 +0000 (17:13 +0000)]
r300: Whitespace cleanup in r300_emit.c.

17 years agor300: Added the r300VAPInputCntl0 function.
Oliver McFadden [Sat, 26 May 2007 15:49:24 +0000 (15:49 +0000)]
r300: Added the r300VAPInputCntl0 function.

The function just returns the hard-coded value (0x5555) even though we have no
idea what this means...

17 years agor300: Added r300VAPOutputCntl0 and r300VAPOutputCntl1 to r300_emit.c.
Oliver McFadden [Sat, 26 May 2007 15:45:04 +0000 (15:45 +0000)]
r300: Added r300VAPOutputCntl0 and r300VAPOutputCntl1 to r300_emit.c.

17 years agor300: Removed R300_PFS_NODE_LAST_NODE replaced by R300_PFS_NODE_OUTPUT_COLOR.
Oliver McFadden [Sat, 26 May 2007 14:43:04 +0000 (14:43 +0000)]
r300: Removed R300_PFS_NODE_LAST_NODE replaced by R300_PFS_NODE_OUTPUT_COLOR.

17 years agor300: Renamed the t_vic function.
Oliver McFadden [Sat, 26 May 2007 12:34:55 +0000 (12:34 +0000)]
r300: Renamed the t_vic function.

17 years agor300: Renamed the t_vir0 and t_vir1 functions.
Oliver McFadden [Sat, 26 May 2007 00:07:25 +0000 (00:07 +0000)]
r300: Renamed the t_vir0 and t_vir1 functions.

17 years agor300: Renamed "dt" to "attribptr" in the t_vir0 function.
Oliver McFadden [Fri, 25 May 2007 23:50:36 +0000 (23:50 +0000)]
r300: Renamed "dt" to "attribptr" in the t_vir0 function.

17 years agor300: Specify the type in the t_vir0 function.
Oliver McFadden [Fri, 25 May 2007 23:42:03 +0000 (23:42 +0000)]
r300: Specify the type in the t_vir0 function.

17 years agor300: Cleaned up t_vir0 and t_vir1 slightly.
Oliver McFadden [Fri, 25 May 2007 23:02:57 +0000 (23:02 +0000)]
r300: Cleaned up t_vir0 and t_vir1 slightly.

17 years agor300: Use C style comments in r300_emit.c.
Oliver McFadden [Fri, 25 May 2007 22:01:20 +0000 (22:01 +0000)]
r300: Use C style comments in r300_emit.c.

17 years agor300: Removed a (disabled and unneeded) assertion.
Oliver McFadden [Fri, 25 May 2007 21:54:45 +0000 (21:54 +0000)]
r300: Removed a (disabled and unneeded) assertion.

The r300EmitVec functions don't touch the buf member so the assertion isn't
needed here.

17 years agor300: Improved the r300EmitVec debugging information.
Oliver McFadden [Fri, 25 May 2007 21:49:53 +0000 (21:49 +0000)]
r300: Improved the r300EmitVec debugging information.

17 years agor300: Use #if 0 for disabled code.
Oliver McFadden [Fri, 25 May 2007 21:43:24 +0000 (21:43 +0000)]
r300: Use #if 0 for disabled code.

17 years agor300: Added a TODO note and some tiny cleanups to r300_emit.c.
Oliver McFadden [Fri, 25 May 2007 21:38:49 +0000 (21:38 +0000)]
r300: Added a TODO note and some tiny cleanups to r300_emit.c.

17 years agoadd glxtokens.h to xmesa_xf86.h as discussed on mailing list
Dave Airlie [Sat, 26 May 2007 05:58:56 +0000 (15:58 +1000)]
add glxtokens.h to xmesa_xf86.h as discussed on mailing list

17 years agoremove #include "GL/glxtokens.h"
Brian [Fri, 25 May 2007 14:57:44 +0000 (08:57 -0600)]
remove #include "GL/glxtokens.h"

17 years agor300: Use GL_TRUE rather than 1 for the GLboolean type.
Oliver McFadden [Fri, 25 May 2007 13:59:15 +0000 (13:59 +0000)]
r300: Use GL_TRUE rather than 1 for the GLboolean type.

17 years agor300: Removed unused vpucount macro from r300_state.c.
Oliver McFadden [Thu, 24 May 2007 09:15:57 +0000 (09:15 +0000)]
r300: Removed unused vpucount macro from r300_state.c.

17 years agofix logic for calling _swrast_update_deferred_texture()
Brian [Thu, 24 May 2007 23:07:48 +0000 (17:07 -0600)]
fix logic for calling _swrast_update_deferred_texture()

17 years agodoxygen-ize some comments
Brian [Wed, 23 May 2007 22:58:01 +0000 (16:58 -0600)]
doxygen-ize some comments

17 years agorestore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049
Brian [Wed, 23 May 2007 22:49:32 +0000 (16:49 -0600)]
restore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049

17 years agoincr/decr 1D/2DArray texture refcounts like other targets
Brian [Wed, 23 May 2007 22:42:29 +0000 (16:42 -0600)]
incr/decr 1D/2DArray texture refcounts like other targets

17 years agor300: Call the r300Fogfv function directly within r300_state.c.
Oliver McFadden [Wed, 23 May 2007 21:26:35 +0000 (21:26 +0000)]
r300: Call the r300Fogfv function directly within r300_state.c.

This required moving the r300Enable function but there are no actual changes.

17 years agoFix problem w/ two-sided lighting and fragment programs (depth-peel regression)
Brian [Wed, 23 May 2007 21:33:46 +0000 (15:33 -0600)]
Fix problem w/ two-sided lighting and fragment programs (depth-peel regression)

17 years agor300: Use switch statements in r300ResetHwState, etc.
Oliver McFadden [Wed, 23 May 2007 21:12:11 +0000 (21:12 +0000)]
r300: Use switch statements in r300ResetHwState, etc.

17 years agor300: Minor indenting corrections in the texture format table.
Oliver McFadden [Wed, 23 May 2007 18:48:05 +0000 (18:48 +0000)]
r300: Minor indenting corrections in the texture format table.

17 years agor300: Use a single texture format table; reduces duplication.
Oliver McFadden [Wed, 23 May 2007 18:37:55 +0000 (18:37 +0000)]
r300: Use a single texture format table; reduces duplication.

17 years agor300: Corrected the RGB888 texture format entry.
Oliver McFadden [Wed, 23 May 2007 17:56:47 +0000 (17:56 +0000)]
r300: Corrected the RGB888 texture format entry.

I think this is correct, assuming no endian issues. See commmit
59a08923f51d4ed83effbfcd91473c9ee86465f1.

17 years agor300: Removed the R300_RS_INTERP_[0-9]_UNKNOWN (magic) defines.
Oliver McFadden [Mon, 21 May 2007 15:51:38 +0000 (15:51 +0000)]
r300: Removed the R300_RS_INTERP_[0-9]_UNKNOWN (magic) defines.

Supposedly you need to set these values for the interpolaters to work, but they
seem to work fine without these values.

17 years agoFix point attentuation problem (bug 11042)
Brian [Wed, 23 May 2007 14:58:08 +0000 (08:58 -0600)]
Fix point attentuation problem (bug 11042)

ctx->Point._Attentuation was computed in wrong place and the VB->Eye coord Z
array wasn't indexed correctly in run_point_stage().

17 years agoReplace initInitState() with _mesa_init_driver_state().
Brian [Tue, 22 May 2007 22:56:02 +0000 (16:56 -0600)]
Replace initInitState() with _mesa_init_driver_state().

17 years agoadded _mesa_init_driver_state() to replace duplicated code in intel drivers
Brian [Tue, 22 May 2007 22:54:25 +0000 (16:54 -0600)]
added _mesa_init_driver_state() to replace duplicated code in intel drivers

17 years agoinclude swrast_setup/swrast_setup.h to silence warning
Brian [Tue, 22 May 2007 22:50:05 +0000 (16:50 -0600)]
include swrast_setup/swrast_setup.h to silence warning

17 years agodon't treat FRAG_BIT_WPOS as a generic attribute (fixes depth peel regression)
Brian [Tue, 22 May 2007 16:07:49 +0000 (10:07 -0600)]
don't treat FRAG_BIT_WPOS as a generic attribute (fixes depth peel regression)

17 years agoi915tex: Implement SetTexOffset hook.
Michel Dänzer [Tue, 22 May 2007 12:08:11 +0000 (14:08 +0200)]
i915tex: Implement SetTexOffset hook.

Only build tested for I830 generation.

17 years agor300: Implement SetTexOffset hook.
Michel Dänzer [Tue, 22 May 2007 12:08:11 +0000 (14:08 +0200)]
r300: Implement SetTexOffset hook.

17 years agoAdd interfaces for overriding texture images with driver specific 'offsets'.
Michel Dänzer [Tue, 22 May 2007 12:08:10 +0000 (14:08 +0200)]
Add interfaces for overriding texture images with driver specific 'offsets'.

To be used by AIGLX for GLX_EXT_texture_from_pixmap without several
additional data copies.

17 years agoFix xserver build after recent XMesa changes.
Michel Dänzer [Tue, 22 May 2007 11:56:30 +0000 (13:56 +0200)]
Fix xserver build after recent XMesa changes.

Only build tested.

17 years agoget rid of GenTexturesLock, used ctx->Shared->Mutex
Brian [Tue, 22 May 2007 04:10:06 +0000 (22:10 -0600)]
get rid of GenTexturesLock, used ctx->Shared->Mutex

17 years agoremove the unused texobj Mutex field
Brian [Tue, 22 May 2007 03:59:20 +0000 (21:59 -0600)]
remove the unused texobj Mutex field

17 years agoremove a VMS-ism that doesn't seem needed elsewhere
Brian [Tue, 22 May 2007 03:49:34 +0000 (21:49 -0600)]
remove a VMS-ism that doesn't seem needed elsewhere

17 years agoimprove some comments, clean-up formatting
Brian [Tue, 22 May 2007 03:48:33 +0000 (21:48 -0600)]
improve some comments, clean-up formatting

17 years agoremove some whitespace
Brian [Tue, 22 May 2007 03:48:08 +0000 (21:48 -0600)]
remove some whitespace

17 years agoset texcoords depending on GLX_Y_INVERTED_EXT
Brian [Tue, 22 May 2007 02:57:09 +0000 (20:57 -0600)]
set texcoords depending on GLX_Y_INVERTED_EXT

17 years agoreturn True for GLX_Y_INVERTED_EXT query
Brian [Tue, 22 May 2007 02:56:35 +0000 (20:56 -0600)]
return True for GLX_Y_INVERTED_EXT query

17 years agofog: fix potential issues with generated vp using fog
Roland Scheidegger [Tue, 22 May 2007 01:30:09 +0000 (03:30 +0200)]
fog: fix potential issues with generated vp using fog

Change the generated vertex programs (tnl/brw) to follow the same logic as
the tnl fog wrt using absolute value, and sync them up a bit (untested).

17 years agofog: fix issues with negative fog coords (may fix #10529)
Roland Scheidegger [Tue, 22 May 2007 01:29:59 +0000 (03:29 +0200)]
fog: fix issues with negative fog coords (may fix #10529)

Rework tnl fog a bit. Make sure we always use ABS(eyez) when fog coord source
is depth, OTOH it does not seem to be necessary to use it (as was done before
in some cases) if fog coord source is fogcoord (just to save some work).
This fixes tests/fog (the first 2 cases) with i915/i915tex.

17 years agomake sure optimized fog params get updated
Roland Scheidegger [Tue, 22 May 2007 00:52:39 +0000 (02:52 +0200)]
make sure optimized fog params get updated

17 years agoi915/i915tex: minor cleanup (remove unneeded function call
Roland Scheidegger [Tue, 22 May 2007 00:50:08 +0000 (02:50 +0200)]
i915/i915tex: minor cleanup (remove unneeded function call

17 years agounbreak 3d textures (typo when setting tex layout)
Roland Scheidegger [Mon, 21 May 2007 09:38:25 +0000 (11:38 +0200)]
unbreak 3d textures (typo when setting tex layout)

17 years agoif light position is local, treat it as a homogeneous coord and divide by W (see...
Brian [Mon, 21 May 2007 14:57:18 +0000 (08:57 -0600)]
if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009)

17 years agoOverhaul/simplify SWvertex and SWspan attribute handling.
Brian [Sun, 20 May 2007 18:27:39 +0000 (12:27 -0600)]
Overhaul/simplify SWvertex and SWspan attribute handling.

Instead of separate fog/specular/texcoord/varying code, just treat all of
them as generic attributes.  Simplifies the point/line/triangle functions.

17 years agoadd missing right-paren
Brian [Sun, 20 May 2007 18:17:21 +0000 (12:17 -0600)]
add missing right-paren

17 years agor300: Added TODO comment regarding immediate mode implementation.
Oliver McFadden [Sun, 20 May 2007 17:20:10 +0000 (17:20 +0000)]
r300: Added TODO comment regarding immediate mode implementation.

17 years agor300: Just use "inline" rather than "__inline__".
Oliver McFadden [Sat, 19 May 2007 05:41:55 +0000 (05:41 +0000)]
r300: Just use "inline" rather than "__inline__".

17 years agoneed to copy new 1D/2D array texture objects in _mesa_PushAttrib()
Brian [Sat, 19 May 2007 15:10:44 +0000 (09:10 -0600)]
need to copy new 1D/2D array texture objects in _mesa_PushAttrib()

17 years agoDisable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.
Brian [Sat, 19 May 2007 14:56:15 +0000 (08:56 -0600)]
Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.

If an app (like progs/samples/blendxor.c) includes both gl.h and glext.h
this typedef will get hit in both headers, causing an error.
Possibly work around by bringing GL_NV_geometry_program4 items into gl.h.

17 years agoadded GL_EXT_texture_from_pixmap
Brian [Sat, 19 May 2007 14:29:04 +0000 (08:29 -0600)]
added GL_EXT_texture_from_pixmap

17 years agoGLX_EXT_texture_from_pixmap test
Brian [Sat, 19 May 2007 14:28:41 +0000 (08:28 -0600)]
GLX_EXT_texture_from_pixmap test

17 years agoadded texture_from_pixmap functions
Brian [Sat, 19 May 2007 14:28:07 +0000 (08:28 -0600)]
added texture_from_pixmap functions

17 years agoImplement GLX_EXT_texture_from_pixmap.
Brian [Sat, 19 May 2007 14:27:35 +0000 (08:27 -0600)]
Implement GLX_EXT_texture_from_pixmap.

Could be done more efficiently... but works.

17 years agofix miptree layout (i915) for small compressed mipmaps
Roland Scheidegger [Sat, 19 May 2007 02:38:55 +0000 (04:38 +0200)]
fix miptree layout (i915) for small compressed mipmaps

This seems to work now. Also fix i945 set_level_info, need to match i915
behaviour for storing mip height, as it's assumed to be the mip width
(in texels) elsewhere and the division by 4 is done later (untested).

17 years agofix copy & paste bug of previous commit, breaking dxt5 formats
Roland Scheidegger [Sat, 19 May 2007 01:08:45 +0000 (03:08 +0200)]
fix copy & paste bug of previous commit, breaking dxt5 formats

17 years agofix miptree comparison with compressed textures
Roland Scheidegger [Fri, 18 May 2007 22:59:06 +0000 (00:59 +0200)]
fix miptree comparison with compressed textures

TexelBytes is always 0 with compressed textures, thus would never match
mt->cpp. This caused constant blitting around of textures, and it fixes at
least the horrible performance of Q3 if compressed textures are enabled.

17 years agofix small s3tc mipmaps (#10968)
Roland Scheidegger [Fri, 18 May 2007 22:45:38 +0000 (00:45 +0200)]
fix small s3tc mipmaps (#10968)

make sure that always whole blocks are uploaded.
(May still not work correctly if the top mip map is not at least a full block,
that is 4 pixels wide - not sure, but probably doesn't happen in real world)

17 years agofix STATE_HALF_VECTOR value (bug 10987)
Brian [Fri, 18 May 2007 13:46:27 +0000 (07:46 -0600)]
fix STATE_HALF_VECTOR value (bug 10987)

17 years agochange max anisotropy test
Christoff Brill [Thu, 17 May 2007 23:18:13 +0000 (17:18 -0600)]
change max anisotropy test

17 years agouse R200_DEBUG for debug output
Christoff Brill [Thu, 17 May 2007 23:17:25 +0000 (17:17 -0600)]
use R200_DEBUG for debug output

17 years agoremove CVS/XFree86 keywords
Christoff Brill [Thu, 17 May 2007 23:16:37 +0000 (17:16 -0600)]
remove CVS/XFree86 keywords

17 years agoget rid of needless static function declarations at top of file
Brian [Thu, 17 May 2007 21:28:20 +0000 (15:28 -0600)]
get rid of needless static function declarations at top of file

17 years agoIn DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983.
Brian [Thu, 17 May 2007 21:25:26 +0000 (15:25 -0600)]
In DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983.

17 years agoAdd missing _EXT suffix to 2D_ARRAY target enums.
Ian Romanick [Thu, 17 May 2007 18:54:22 +0000 (11:54 -0700)]
Add missing _EXT suffix to 2D_ARRAY target enums.

17 years agoAdd array texture targets to list that can use compressed formats.
Ian Romanick [Thu, 17 May 2007 18:16:19 +0000 (11:16 -0700)]
Add array texture targets to list that can use compressed formats.

17 years agoRefactor determining whether a texture target can use compressed format
Ian Romanick [Thu, 17 May 2007 18:13:41 +0000 (11:13 -0700)]
Refactor determining whether a texture target can use compressed format

17 years agomake srcPtr param to make_1d_stack_mipmap() const
Brian [Thu, 17 May 2007 14:56:46 +0000 (08:56 -0600)]
make srcPtr param to make_1d_stack_mipmap() const

17 years agoMerge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Thu, 17 May 2007 14:54:08 +0000 (08:54 -0600)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa

17 years agor300: Removed the radeon_vertex_buffer structure.
Tommy Schultz Lassen [Thu, 17 May 2007 14:11:23 +0000 (14:11 +0000)]
r300: Removed the radeon_vertex_buffer structure.

17 years agoInitial implementation of MESA_texture_array
Ian Romanick [Wed, 16 May 2007 22:34:22 +0000 (15:34 -0700)]
Initial implementation of MESA_texture_array

Shadow sampling from texture arrays is still not implemented.  Everything
else should be there, though.

17 years agoInitial version of MESA_texture_array spec.
Ian Romanick [Wed, 16 May 2007 22:33:36 +0000 (15:33 -0700)]
Initial version of MESA_texture_array spec.

17 years agoAdd simple program to test GL_MESA_texture_array.
Ian Romanick [Wed, 16 May 2007 21:46:13 +0000 (14:46 -0700)]
Add simple program to test GL_MESA_texture_array.

17 years agoAdd enums and functions for GL_{MESA,EXT}_texture_array.
Ian Romanick [Wed, 16 May 2007 21:45:52 +0000 (14:45 -0700)]
Add enums and functions for GL_{MESA,EXT}_texture_array.

17 years agoBring framebuffer_texture's error checking more in-line with the spec.
Ian Romanick [Tue, 15 May 2007 20:42:25 +0000 (13:42 -0700)]
Bring framebuffer_texture's error checking more in-line with the spec.

17 years agoSkeleton file for 7.1 release notes.
Brian [Mon, 14 May 2007 20:40:59 +0000 (14:40 -0600)]
Skeleton file for 7.1 release notes.

17 years agomaster/trunk is now for Mesa 7.1 devel: bump versions
Brian [Mon, 14 May 2007 20:30:36 +0000 (14:30 -0600)]
master/trunk is now for Mesa 7.1 devel: bump versions

17 years agoin __glXGetArrayType() return type, not enabled (bug 10938)
Bruce Merry [Mon, 14 May 2007 15:37:48 +0000 (09:37 -0600)]
in __glXGetArrayType() return type, not enabled (bug 10938)

17 years agocomment about fixing uniform structs
Brian [Fri, 11 May 2007 21:50:33 +0000 (15:50 -0600)]
comment about fixing uniform structs

17 years agor300: Enable the non-user-buffers code to compile.
Oliver McFadden [Sun, 13 May 2007 13:38:38 +0000 (13:38 +0000)]
r300: Enable the non-user-buffers code to compile.

17 years agor300: Use e32(0x0) rather than e32(0); makes greping for hex values easier.
Oliver McFadden [Sun, 13 May 2007 12:59:41 +0000 (12:59 +0000)]
r300: Use e32(0x0) rather than e32(0); makes greping for hex values easier.

17 years agor300: Use the defined values when writing to R300_RS_ROUTE_0.
Oliver McFadden [Sun, 13 May 2007 12:56:59 +0000 (12:56 +0000)]
r300: Use the defined values when writing to R300_RS_ROUTE_0.

17 years agor300: Use the defined values when writing to R300_SE_VTE_CNTL.
Oliver McFadden [Sun, 13 May 2007 12:43:40 +0000 (12:43 +0000)]
r300: Use the defined values when writing to R300_SE_VTE_CNTL.

You can verify this is correct with the following code.

  assert (0x043f ==
  (R300_VTX_W0_FMT | R300_VPORT_X_SCALE_ENA | R300_VPORT_X_OFFSET_ENA
   | R300_VPORT_Y_SCALE_ENA | R300_VPORT_Y_OFFSET_ENA |
   R300_VPORT_Z_SCALE_ENA | R300_VPORT_Z_OFFSET_ENA));

17 years agor300: Added a TODO comment for the R300_VAP_INPUT_ROUTE_[01]_0 values.
Oliver McFadden [Sun, 13 May 2007 12:36:27 +0000 (12:36 +0000)]
r300: Added a TODO comment for the R300_VAP_INPUT_ROUTE_[01]_0 values.

17 years agor300: Changed some more functions to static functions.
Oliver McFadden [Sun, 13 May 2007 09:09:30 +0000 (09:09 +0000)]
r300: Changed some more functions to static functions.

This required reordering some of the functions which is why the diff is a little
larger.

17 years agor300: Changed a couple of functions in r300_state.c to static functions.
Oliver McFadden [Sun, 13 May 2007 08:59:54 +0000 (08:59 +0000)]
r300: Changed a couple of functions in r300_state.c to static functions.

17 years agor300: Removed the unused r300_aos_rec (replaced by r300_dma_region) structure.
Oliver McFadden [Sun, 13 May 2007 08:43:30 +0000 (08:43 +0000)]
r300: Removed the unused r300_aos_rec (replaced by r300_dma_region) structure.

17 years agor300: Use #if 0 for disabled code, rather than commenting it out.
Oliver McFadden [Sun, 13 May 2007 08:28:51 +0000 (08:28 +0000)]
r300: Use #if 0 for disabled code, rather than commenting it out.

17 years agor300: Removed a couple of obsolete/commented out includes.
Oliver McFadden [Sun, 13 May 2007 08:21:50 +0000 (08:21 +0000)]
r300: Removed a couple of obsolete/commented out includes.

17 years agor300: A few very minor indenting corrections.
Oliver McFadden [Sun, 13 May 2007 07:51:41 +0000 (07:51 +0000)]
r300: A few very minor indenting corrections.