Commit Graph

11457 Commits

Author SHA1 Message Date
Oliver McFadden 62b6eef0d7 r300: Just use "inline" rather than "__inline__". 2007-05-20 13:38:32 +00:00
Brian a2305ebfa2 need to copy new 1D/2D array texture objects in _mesa_PushAttrib() 2007-05-19 09:10:44 -06:00
Brian 74519c4231 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.
2007-05-19 08:56:15 -06:00
Brian 80a5798719 added GL_EXT_texture_from_pixmap 2007-05-19 08:30:31 -06:00
Brian 4465377ca3 GLX_EXT_texture_from_pixmap test 2007-05-19 08:30:31 -06:00
Brian 7ace7cfba4 added texture_from_pixmap functions 2007-05-19 08:30:31 -06:00
Brian fd54564f78 Implement GLX_EXT_texture_from_pixmap.
Could be done more efficiently... but works.
2007-05-19 08:30:31 -06:00
Roland Scheidegger eb6418b895 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).
2007-05-19 04:38:55 +02:00
Roland Scheidegger 25551bdfad fix copy & paste bug of previous commit, breaking dxt5 formats 2007-05-19 03:08:45 +02:00
Roland Scheidegger 28f53ace33 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.
2007-05-19 00:59:46 +02:00
Roland Scheidegger 3ad9c551b9 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)
2007-05-19 00:59:46 +02:00
Eric Anholt 1bdee18536 Merge branch 'master' into i915-unification
Conflicts:

	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/i915tex/intel_batchpool.c
	src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
	src/mesa/drivers/dri/i915tex/intel_regions.c
	src/mesa/drivers/dri/i915tex/intel_screen.c
	src/mesa/drivers/dri/i915tex/intel_screen.h
2007-05-18 14:14:12 -07:00
Eric Anholt c085e350df Fix a refcounting mistake with first_swap_fence. 2007-05-18 13:47:46 -07:00
Eric Anholt a926b7397b Fix another mis-calling of _fence_wait_internal. 2007-05-18 13:47:21 -07:00
Eric Anholt 431baf221e Allow unreference with a NULL argument. 2007-05-18 12:59:39 -07:00
Eric Anholt 425d0c6305 Fix double-counting of low_offset in block->virtual. 2007-05-18 12:57:34 -07:00
Eric Anholt b0529dcc7b Zero out bufmgr_fake on alloc. 2007-05-18 12:39:00 -07:00
Eric Anholt 71648a088e Dead code elimination and fix bufmgr_fake_wait_idle. 2007-05-18 12:10:05 -07:00
Eric Anholt 180f0bb964 Kill old struct bufmgr members. 2007-05-18 12:09:34 -07:00
Eric Anholt bb1bb88bab Fix some use-before-initialize in bufmgr_fake. 2007-05-18 11:55:00 -07:00
Eric Anholt 4cf2cc0d18 Ratchet required version down to 1.5 (pre-TTM). 2007-05-18 11:29:55 -07:00
Brian 4fca6bfa5d fix STATE_HALF_VECTOR value (bug 10987) 2007-05-18 07:46:27 -06:00
Christoff Brill 8452814ec6 change max anisotropy test 2007-05-17 17:18:13 -06:00
Christoff Brill 63155ca2ca use R200_DEBUG for debug output 2007-05-17 17:17:25 -06:00
Christoff Brill 0985e786cd remove CVS/XFree86 keywords 2007-05-17 17:16:37 -06:00
Eric Anholt b12b24a430 Restore missing intel_batchbuffer_reset() which was needed. 2007-05-17 15:36:43 -07:00
Eric Anholt 1f08f5d970 Rename the i915tex_dri.so driver to just i915_dri.so again. 2007-05-17 15:36:26 -07:00
Eric Anholt cfc21190af Convert i915tex to the new interface and make it compile. 2007-05-17 15:28:01 -07:00
Brian 57ca033885 get rid of needless static function declarations at top of file 2007-05-17 15:28:42 -06:00
Brian 7fcf231c57 In DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983. 2007-05-17 15:28:42 -06:00
Ian Romanick d834a870e6 Add missing _EXT suffix to 2D_ARRAY target enums. 2007-05-17 11:54:22 -07:00
Ian Romanick 817181ea50 Add array texture targets to list that can use compressed formats. 2007-05-17 11:16:19 -07:00
Ian Romanick 064cd7c78c Refactor determining whether a texture target can use compressed format 2007-05-17 11:14:58 -07:00
Brian b5bbe055e4 make srcPtr param to make_1d_stack_mipmap() const 2007-05-17 08:56:46 -06:00
Brian 6ee6b2dcd9 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-05-17 08:54:08 -06:00
Tommy Schultz Lassen 67f82731fc r300: Removed the radeon_vertex_buffer structure. 2007-05-17 14:11:23 +00:00
Ian Romanick bb372f1c9b Initial implementation of MESA_texture_array
Shadow sampling from texture arrays is still not implemented.  Everything
else should be there, though.
2007-05-16 15:34:22 -07:00
Ian Romanick 9ebffb86a6 Initial version of MESA_texture_array spec. 2007-05-16 15:33:36 -07:00
Eric Anholt 7b971a5008 WIP: Replace TTM buffer pool manager with a simplified interface.
The interface is not solid yet (some simplification to do still, and
adjustment for 0-copy), and the drivers are not converted.  However, the new
interface allows using the same calls to support either a TTM or a classic
static allocation backend, with the static backend allowing a more limited
feature set.
2007-05-16 15:14:20 -07:00
Ian Romanick 2f61cbd30c Add simple program to test GL_MESA_texture_array. 2007-05-16 14:46:13 -07:00
Ian Romanick 78bd2912f8 Add enums and functions for GL_{MESA,EXT}_texture_array. 2007-05-16 14:45:52 -07:00
Ian Romanick b0fe0d8a55 Bring framebuffer_texture's error checking more in-line with the spec. 2007-05-15 13:42:25 -07:00
Brian 347bb541f5 Skeleton file for 7.1 release notes. 2007-05-14 14:40:59 -06:00
Brian c128c3ce8c master/trunk is now for Mesa 7.1 devel: bump versions 2007-05-14 14:30:36 -06:00
Bruce Merry 6efdf648f5 in __glXGetArrayType() return type, not enabled (bug 10938) 2007-05-14 09:38:23 -06:00
Brian 6a587c0124 comment about fixing uniform structs 2007-05-14 09:38:23 -06:00
Oliver McFadden 524c3336c4 r300: Enable the non-user-buffers code to compile. 2007-05-13 13:38:38 +00:00
Oliver McFadden 0e7e211055 r300: Use e32(0x0) rather than e32(0); makes greping for hex values easier. 2007-05-13 12:59:41 +00:00
Oliver McFadden 4e641bf3e9 r300: Use the defined values when writing to R300_RS_ROUTE_0. 2007-05-13 12:56:59 +00:00
Oliver McFadden 2189ff5e51 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));
2007-05-13 12:43:40 +00:00