platform/upstream/mesa.git
14 years agomesa: added MESA_FORMAT_SIGNED_RGBA_16 for accum buffers
Brian Paul [Wed, 7 Oct 2009 01:00:09 +0000 (19:00 -0600)]
mesa: added MESA_FORMAT_SIGNED_RGBA_16 for accum buffers

14 years agomesa: added _mesa_get_format_color_encoding()
Brian Paul [Wed, 7 Oct 2009 00:56:29 +0000 (18:56 -0600)]
mesa: added _mesa_get_format_color_encoding()

14 years agomesa: accept more pnames in _mesa_get_format_bits()
Brian Paul [Wed, 7 Oct 2009 00:54:13 +0000 (18:54 -0600)]
mesa: accept more pnames in _mesa_get_format_bits()

14 years agodrivers: don't include texformat.h
Brian Paul [Tue, 6 Oct 2009 00:11:35 +0000 (18:11 -0600)]
drivers: don't include texformat.h

And remove other unneeded #includes while we're at it.

14 years agomesa: don't include texformat.h
Brian Paul [Mon, 5 Oct 2009 23:56:31 +0000 (17:56 -0600)]
mesa: don't include texformat.h

14 years agomesa: move _mesa_format_to_type_and_comps() to formats.c
Brian Paul [Mon, 5 Oct 2009 23:54:20 +0000 (17:54 -0600)]
mesa: move _mesa_format_to_type_and_comps() to formats.c

14 years agomesa: move gl_format_info struct to formats.c
Brian Paul [Mon, 5 Oct 2009 23:50:33 +0000 (17:50 -0600)]
mesa: move gl_format_info struct to formats.c

This is a private datatype.

14 years agomesa: remove feature tests
Brian Paul [Mon, 5 Oct 2009 23:48:22 +0000 (17:48 -0600)]
mesa: remove feature tests

14 years agomesa: use FetchTexelf() instead of FetchTexelc()
Brian Paul [Mon, 5 Oct 2009 23:28:39 +0000 (17:28 -0600)]
mesa: use FetchTexelf() instead of FetchTexelc()

14 years agomesa: add parenthesis
Brian Paul [Mon, 5 Oct 2009 23:27:50 +0000 (17:27 -0600)]
mesa: add parenthesis

14 years agomesa: lift _mesa_set_fetch_functions() calls out of drivers
Brian Paul [Mon, 5 Oct 2009 23:12:36 +0000 (17:12 -0600)]
mesa: lift _mesa_set_fetch_functions() calls out of drivers

Call it from in the main Mesa glTexImage functions.

14 years agomesa: make _mesa_get_texel_fetch_func() static
Brian Paul [Mon, 5 Oct 2009 22:52:26 +0000 (16:52 -0600)]
mesa: make _mesa_get_texel_fetch_func() static

14 years agomesa: removed gl_texture_image::CompressedSize field
Brian Paul [Fri, 2 Oct 2009 03:13:25 +0000 (21:13 -0600)]
mesa: removed gl_texture_image::CompressedSize field

Just call ctx->Driver.CompressedTextureSize() when we need to get
the compressed image size.

14 years agomesa: reformatting
Brian Paul [Fri, 2 Oct 2009 01:01:02 +0000 (19:01 -0600)]
mesa: reformatting

14 years agoprogs/tests: additional debug code
Brian Paul [Thu, 1 Oct 2009 22:43:22 +0000 (16:43 -0600)]
progs/tests: additional debug code

14 years agomesa: move mesa_set_fetch_functions()
Brian Paul [Thu, 1 Oct 2009 22:42:37 +0000 (16:42 -0600)]
mesa: move mesa_set_fetch_functions()

14 years agoradeon: fix tx_table[] entry
Brian Paul [Thu, 1 Oct 2009 22:41:47 +0000 (16:41 -0600)]
radeon: fix tx_table[] entry

XXX need to still verify that the table entries are in correct order.

14 years agosavage: s/Xfree/_mesa_free/
Brian Paul [Thu, 1 Oct 2009 22:41:24 +0000 (16:41 -0600)]
savage: s/Xfree/_mesa_free/

14 years agomesa: simplify _mesa_compressed_texture_size()
Brian Paul [Thu, 1 Oct 2009 22:30:47 +0000 (16:30 -0600)]
mesa: simplify _mesa_compressed_texture_size()

14 years agomesa: remove gl_texture_image::IsCompressed field
Brian Paul [Thu, 1 Oct 2009 22:29:44 +0000 (16:29 -0600)]
mesa: remove gl_texture_image::IsCompressed field

Use _mesa_is_format_compressed() instead.

14 years agomesa: added _mesa_format_row_stride()
Brian Paul [Thu, 1 Oct 2009 22:27:23 +0000 (16:27 -0600)]
mesa: added _mesa_format_row_stride()

14 years agomesa: added _mesa_format_image_size()
Brian Paul [Thu, 1 Oct 2009 21:59:13 +0000 (15:59 -0600)]
mesa: added _mesa_format_image_size()

14 years agoswrast: fix some texformat regressions
Brian Paul [Thu, 1 Oct 2009 04:50:05 +0000 (22:50 -0600)]
swrast: fix some texformat regressions

Need to be careful with component ordering for MESA_FORMAT_RGB888
and MESA_FORMAT_RGBA8888.

14 years agomesa: rename texformat_tmp.h to texfetch_tmp.h
Brian Paul [Thu, 1 Oct 2009 03:08:06 +0000 (21:08 -0600)]
mesa: rename texformat_tmp.h to texfetch_tmp.h

14 years agomesa: remove MESA_FORMAT_RGBA4444
Brian Paul [Thu, 1 Oct 2009 03:04:14 +0000 (21:04 -0600)]
mesa: remove MESA_FORMAT_RGBA4444

Not used by any hardware driver.  ARGB4444 and ARGB4444_REV remain.

14 years agomesa: remove GLchan-based formats; use hw 8-bit/channel formats instead
Brian Paul [Thu, 1 Oct 2009 03:00:16 +0000 (21:00 -0600)]
mesa: remove GLchan-based formats; use hw 8-bit/channel formats instead

Removed: MESA_FORMAT_RGBA, RGB, ALPHA, LUMINANCE, LUMINANCE_ALPHA, INTENSITY.

14 years agomesa: move texel fetch/store into new texfetch.[ch] files
Brian Paul [Thu, 1 Oct 2009 02:47:54 +0000 (20:47 -0600)]
mesa: move texel fetch/store into new texfetch.[ch] files

14 years agost/mesa: update comment
Brian Paul [Thu, 1 Oct 2009 02:36:25 +0000 (20:36 -0600)]
st/mesa: update comment

14 years agomesa: remove gl_texture_format
Brian Paul [Thu, 1 Oct 2009 02:35:32 +0000 (20:35 -0600)]
mesa: remove gl_texture_format

14 years agomesa: replace gl_texture_format with gl_format
Brian Paul [Thu, 1 Oct 2009 02:28:45 +0000 (20:28 -0600)]
mesa: replace gl_texture_format with gl_format

Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum.
ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x.
gl_texture_format will go away next.

14 years agomesa: move StoreTexImageFunc typedef to .c file
Brian Paul [Tue, 29 Sep 2009 03:55:47 +0000 (21:55 -0600)]
mesa: move StoreTexImageFunc typedef to .c file

14 years agomesa: use _mesa_texstore()
Brian Paul [Tue, 29 Sep 2009 03:52:43 +0000 (21:52 -0600)]
mesa: use _mesa_texstore()

14 years agost/mesa: use _mesa_texstore()
Brian Paul [Tue, 29 Sep 2009 03:52:23 +0000 (21:52 -0600)]
st/mesa: use _mesa_texstore()

14 years agomesa: make individual texstore functions static
Brian Paul [Tue, 29 Sep 2009 03:49:38 +0000 (21:49 -0600)]
mesa: make individual texstore functions static

14 years agoglide: use _mesa_texstore()
Brian Paul [Tue, 29 Sep 2009 03:49:10 +0000 (21:49 -0600)]
glide: use _mesa_texstore()

14 years agodrivers: use _mesa_texstore
Brian Paul [Tue, 29 Sep 2009 03:46:34 +0000 (21:46 -0600)]
drivers: use _mesa_texstore

14 years agodrivers: use new _mesa_texstore() function
Brian Paul [Tue, 29 Sep 2009 03:41:11 +0000 (21:41 -0600)]
drivers: use new _mesa_texstore() function

14 years agomesa: new _mesa_texstore() function
Brian Paul [Tue, 29 Sep 2009 03:40:50 +0000 (21:40 -0600)]
mesa: new _mesa_texstore() function

14 years agomesa: change _mesa_format_to_type_and_comps() format parameter type
Brian Paul [Mon, 28 Sep 2009 03:32:12 +0000 (21:32 -0600)]
mesa: change _mesa_format_to_type_and_comps() format parameter type

14 years agomesa: sort texstore_funcs[] array, remove search loop
Brian Paul [Mon, 28 Sep 2009 03:22:57 +0000 (21:22 -0600)]
mesa: sort texstore_funcs[] array, remove search loop

14 years agomesa: fix render buffer _BaseFormat assignment
Brian Paul [Mon, 28 Sep 2009 03:14:43 +0000 (21:14 -0600)]
mesa: fix render buffer _BaseFormat assignment

14 years agomesa: use texture format functions
Brian Paul [Mon, 28 Sep 2009 03:14:12 +0000 (21:14 -0600)]
mesa: use texture format functions

14 years agomesa: update comments
Brian Paul [Mon, 28 Sep 2009 03:13:46 +0000 (21:13 -0600)]
mesa: update comments

14 years agomesa: use more mesa format functions
Brian Paul [Mon, 28 Sep 2009 03:07:57 +0000 (21:07 -0600)]
mesa: use more mesa format functions

14 years agomesa: fix GL_TEXTURE_LUMINANCE_SIZE query
Brian Paul [Mon, 28 Sep 2009 02:59:28 +0000 (20:59 -0600)]
mesa: fix GL_TEXTURE_LUMINANCE_SIZE query

14 years agomesa: use more mesa format functions
Brian Paul [Mon, 28 Sep 2009 02:58:05 +0000 (20:58 -0600)]
mesa: use more mesa format functions

14 years agomesa: use more mesa format functions
Brian Paul [Mon, 28 Sep 2009 02:56:04 +0000 (20:56 -0600)]
mesa: use more mesa format functions

14 years agomesa: use more format helper functions
Brian Paul [Mon, 28 Sep 2009 02:51:18 +0000 (20:51 -0600)]
mesa: use more format helper functions

14 years agomesa: code movement
Brian Paul [Mon, 28 Sep 2009 02:40:53 +0000 (20:40 -0600)]
mesa: code movement

14 years agodrivers: use more mesa format functions
Brian Paul [Mon, 28 Sep 2009 02:40:35 +0000 (20:40 -0600)]
drivers: use more mesa format functions

14 years agomesa/drivers: use _mesa_get_format_bytes()
Brian Paul [Mon, 28 Sep 2009 02:24:59 +0000 (20:24 -0600)]
mesa/drivers: use _mesa_get_format_bytes()

14 years agomesa/drivers: use _mesa_get_format_bytes()
Brian Paul [Mon, 28 Sep 2009 02:07:41 +0000 (20:07 -0600)]
mesa/drivers: use _mesa_get_format_bytes()

14 years agovia: use mesa texture format helper functions
Brian Paul [Mon, 28 Sep 2009 01:58:18 +0000 (19:58 -0600)]
via: use mesa texture format helper functions

14 years agoglide: use _mesa_get_format_bytes()
Brian Paul [Mon, 28 Sep 2009 01:53:54 +0000 (19:53 -0600)]
glide: use _mesa_get_format_bytes()

14 years agomesa: use _mesa_get_format_base_format()
Brian Paul [Mon, 28 Sep 2009 01:51:45 +0000 (19:51 -0600)]
mesa: use _mesa_get_format_base_format()

14 years agomesa: use _mesa_get_format_bytes()
Brian Paul [Mon, 28 Sep 2009 01:49:51 +0000 (19:49 -0600)]
mesa: use _mesa_get_format_bytes()

14 years agomesa: added _mesa_get_format_datatype()
Brian Paul [Mon, 28 Sep 2009 01:42:36 +0000 (19:42 -0600)]
mesa: added _mesa_get_format_datatype()

14 years agomesa: use _mesa_get_format_bits()
Brian Paul [Mon, 28 Sep 2009 01:38:21 +0000 (19:38 -0600)]
mesa: use _mesa_get_format_bits()

14 years agomesa: added _mesa_get_format_bits()
Brian Paul [Mon, 28 Sep 2009 01:07:44 +0000 (19:07 -0600)]
mesa: added _mesa_get_format_bits()

14 years agomesa: remove unused gl_texture_format fields
Brian Paul [Mon, 28 Sep 2009 00:57:02 +0000 (18:57 -0600)]
mesa: remove unused gl_texture_format fields

14 years agomesa: added MESA_FORMAT_NONE
Brian Paul [Mon, 28 Sep 2009 00:53:22 +0000 (18:53 -0600)]
mesa: added MESA_FORMAT_NONE

14 years agomesa: move StoreTexImageFunc to texstore.h
Brian Paul [Mon, 28 Sep 2009 00:50:04 +0000 (18:50 -0600)]
mesa: move StoreTexImageFunc to texstore.h

14 years agomesa: rework null texel fetch/store funcs
Brian Paul [Mon, 28 Sep 2009 00:49:14 +0000 (18:49 -0600)]
mesa: rework null texel fetch/store funcs

14 years agomesa: replace function pointer types with void *
Brian Paul [Mon, 28 Sep 2009 00:39:48 +0000 (18:39 -0600)]
mesa: replace function pointer types with void *

These fields are no longer used and will be removed soon.

14 years agost/mesa: use _mesa_get_texstore_func()
Brian Paul [Mon, 28 Sep 2009 00:39:17 +0000 (18:39 -0600)]
st/mesa: use _mesa_get_texstore_func()

14 years agomesa: use _mesa_get_texstore_func()
Brian Paul [Mon, 28 Sep 2009 00:38:50 +0000 (18:38 -0600)]
mesa: use _mesa_get_texstore_func()

14 years agoglide: use _mesa_get_texstore_func()
Brian Paul [Mon, 28 Sep 2009 00:34:12 +0000 (18:34 -0600)]
glide: use _mesa_get_texstore_func()

14 years agomesa: NULL-out unused texformat field initializers
Brian Paul [Mon, 28 Sep 2009 00:28:48 +0000 (18:28 -0600)]
mesa: NULL-out unused texformat field initializers

14 years agomesa: use _mesa_get_texstore_func()
Brian Paul [Mon, 28 Sep 2009 00:28:22 +0000 (18:28 -0600)]
mesa: use _mesa_get_texstore_func()

14 years agost/mesa: use _mesa_get_texstore_func()
Brian Paul [Mon, 28 Sep 2009 00:27:59 +0000 (18:27 -0600)]
st/mesa: use _mesa_get_texstore_func()

14 years agomesa: null-out StoreTexImageFunc fields
Brian Paul [Mon, 28 Sep 2009 00:19:24 +0000 (18:19 -0600)]
mesa: null-out StoreTexImageFunc fields

14 years agomesa: use _mesa_get_texel_store_func()
Brian Paul [Mon, 28 Sep 2009 00:17:32 +0000 (18:17 -0600)]
mesa: use _mesa_get_texel_store_func()

14 years agomesa: use new look-up table to get texel fetch/store funcs
Brian Paul [Mon, 28 Sep 2009 00:09:23 +0000 (18:09 -0600)]
mesa: use new look-up table to get texel fetch/store funcs

14 years agomesa: make some s3tc/fxt1 functions public
Brian Paul [Mon, 28 Sep 2009 00:08:49 +0000 (18:08 -0600)]
mesa: make some s3tc/fxt1 functions public

14 years agoprogs/tests: disable texturing before printing text
Brian Paul [Mon, 28 Sep 2009 00:02:02 +0000 (18:02 -0600)]
progs/tests: disable texturing before printing text

14 years agomesa: minor clean-up in _mesa_texstore_srgb8()
Brian Paul [Sun, 27 Sep 2009 23:07:22 +0000 (17:07 -0600)]
mesa: minor clean-up in _mesa_texstore_srgb8()

14 years agomesa: use _mesa_get_texstore_func() to get texture image store func
Brian Paul [Sun, 27 Sep 2009 23:01:41 +0000 (17:01 -0600)]
mesa: use _mesa_get_texstore_func() to get texture image store func

14 years agomesa: move _mesa_get_texstore_func() to texstore.c
Brian Paul [Sat, 26 Sep 2009 18:32:13 +0000 (12:32 -0600)]
mesa: move _mesa_get_texstore_func() to texstore.c

14 years agomesa: begin removing dependencies on gl_texture_format in texstore code
Brian Paul [Sat, 26 Sep 2009 18:26:18 +0000 (12:26 -0600)]
mesa: begin removing dependencies on gl_texture_format in texstore code

14 years agomesa: added formats.c to build
Brian Paul [Sat, 26 Sep 2009 18:25:02 +0000 (12:25 -0600)]
mesa: added formats.c to build

14 years agomesa: include formats.h
Brian Paul [Sat, 26 Sep 2009 18:24:17 +0000 (12:24 -0600)]
mesa: include formats.h

14 years agomesa: initial check-in of new formats.[ch] files
Brian Paul [Sat, 26 Sep 2009 18:21:03 +0000 (12:21 -0600)]
mesa: initial check-in of new formats.[ch] files

14 years agor300g: add tx depth support in register.
Dave Airlie [Sat, 26 Sep 2009 09:32:46 +0000 (19:32 +1000)]
r300g: add tx depth support in register.

also enable cube/3d bits in txformat reg

14 years agor300g: only pass complete texture state to hw setup function
Dave Airlie [Sat, 26 Sep 2009 08:38:39 +0000 (18:38 +1000)]
r300g: only pass complete texture state to hw setup function

No point passing things twice here, also allows more state
to be setup properly.

14 years agor300g: add missing break in OQ emit
Dave Airlie [Sat, 26 Sep 2009 08:38:07 +0000 (18:38 +1000)]
r300g: add missing break in OQ emit

14 years agollvmpipe: Allow building with LLVM 2.6 too.
José Fonseca [Sat, 26 Sep 2009 08:33:32 +0000 (09:33 +0100)]
llvmpipe: Allow building with LLVM 2.6 too.

14 years agor300g: report GL1.5, enable cap bits for OQ and shadow.
Dave Airlie [Sat, 26 Sep 2009 08:25:00 +0000 (18:25 +1000)]
r300g: report GL1.5, enable cap bits for OQ and shadow.

Its not like it works well on 1.3 so may as well reach for greater
heights.

Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agor300g: add z16 unorm texture format
Dave Airlie [Sat, 26 Sep 2009 08:24:34 +0000 (18:24 +1000)]
r300g: add z16 unorm texture format

14 years agor300g: fix texture pitch to correct value.
Dave Airlie [Sat, 26 Sep 2009 06:39:13 +0000 (16:39 +1000)]
r300g: fix texture pitch to correct value.

pitch is pixels - 1, not bytes.

14 years agoMerge branch 'asm-shader-rework-2'
Ian Romanick [Fri, 25 Sep 2009 23:57:38 +0000 (16:57 -0700)]
Merge branch 'asm-shader-rework-2'

Conflicts:
src/mesa/shader/program_parse.tab.c

14 years agost/xorg: Re-enable accelerated fills and copies.
Michel Dänzer [Fri, 25 Sep 2009 18:49:53 +0000 (20:49 +0200)]
st/xorg: Re-enable accelerated fills and copies.

These seem to work well enough now with the new code. Composite acceleration
isn't quite there yet and thus remains disabled in xorg_composite_bind_state()
for now.

14 years agost/xorg: Flush render cache if but only if a source has pending write operations.
Michel Dänzer [Fri, 25 Sep 2009 18:49:53 +0000 (20:49 +0200)]
st/xorg: Flush render cache if but only if a source has pending write operations.

14 years agost/xorg: Reject Composite acceleration for some cases not working yet.
Michel Dänzer [Fri, 25 Sep 2009 18:49:53 +0000 (20:49 +0200)]
st/xorg: Reject Composite acceleration for some cases not working yet.

14 years agost/xorg: Make sure struct is fully initialized.
Michel Dänzer [Fri, 25 Sep 2009 18:49:00 +0000 (20:49 +0200)]
st/xorg: Make sure struct is fully initialized.

gcc complained about a missing initializer.

14 years agost/xorg: Use generic semantic for Composite mask coordinates.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Use generic semantic for Composite mask coordinates.

14 years agost/xorg: Flesh out EXA PrepareComposite hook a little.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Flesh out EXA PrepareComposite hook a little.

Check that the formats are supported, and don't crash with source-only
pictures.

14 years agost/xorg: Use I8 format instead of A8 for depth 8 pixmaps.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Use I8 format instead of A8 for depth 8 pixmaps.

Seems to work better for Composite acceleration.

14 years agost/xorg: Bind rasterizer state for copies.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Bind rasterizer state for copies.

14 years agost/xorg: Source-only pictures always have format PICT_a8r8g8b8.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Source-only pictures always have format PICT_a8r8g8b8.

See xserver/render/picture.c:createSourcePicture(). This both simplifies the
code and avoids a crash because pFormat is NULL.

14 years agost/xorg: Better checks for unsupported component alpha pictures.
Michel Dänzer [Fri, 25 Sep 2009 18:38:49 +0000 (20:38 +0200)]
st/xorg: Better checks for unsupported component alpha pictures.