mesa.git
13 years agomesa: Fix glGetUniform() type conversions.
Eric Anholt [Tue, 23 Aug 2011 20:46:12 +0000 (13:46 -0700)]
mesa: Fix glGetUniform() type conversions.

We were primarily failing to convert in the NativeIntegers case, which
this fixes.  However, we were also just truncating float uniforms when
converting to integer, which does not appear to be the correct
behavior.  Note, however, that the NVIDIA drivers also truncate
instead of rounding.

GL_DOUBLE return type is dropped because it was never used and
completely broken.  It can be added when there's test code.

Fixes piglit ARB_shader_objects/getuniform

v2: This is a rewrite of my previous glGetUniform patch, which Ken
    pointed out missed storage_type-based conversions to integer,
    which was totally broken still thanks to a typo in the testcase.
v3: Quote the spec justifying the rounding behavior.

Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agomesa: Make the gl_constant_value's bool occupy the same space as float/int.
Eric Anholt [Fri, 19 Aug 2011 18:58:43 +0000 (11:58 -0700)]
mesa: Make the gl_constant_value's bool occupy the same space as float/int.

At least for Intel, all our uniform components are of uint32_t size, either
float or signed or unsigned int.  For uploading uniform data in the driver,
it's much easier to upload a full dword per uniform element instead of trying
to pick out the bool byte and then fill in the top 3 bytes of pad with 0.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Use native integer uniforms when the new VS backend is in use.
Eric Anholt [Fri, 19 Aug 2011 18:51:43 +0000 (11:51 -0700)]
i965: Use native integer uniforms when the new VS backend is in use.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965/vs: Move the flag for whether to use the new backend to the context.
Eric Anholt [Fri, 19 Aug 2011 18:42:50 +0000 (11:42 -0700)]
i965/vs: Move the flag for whether to use the new backend to the context.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoi965: Build i965_dri.so for Android
Chad Versace [Fri, 26 Aug 2011 22:35:47 +0000 (15:35 -0700)]
i965: Build i965_dri.so for Android

Compile tested only.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agoi965: Fix Android build by removing relative includes
Chad Versace [Fri, 26 Aug 2011 20:58:41 +0000 (13:58 -0700)]
i965: Fix Android build by removing relative includes

Replace each occurence of
    #include "../glsl/*.h"
with
    #include "glsl/*.h"

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agodri: Build libmesa_dri_common for Android
Chad Versace [Fri, 26 Aug 2011 23:00:33 +0000 (16:00 -0700)]
dri: Build libmesa_dri_common for Android

libmesa_dri_common is a static library that contains the sources in
src/mesa/drivers/dri/common. Each DRI driver should link to it.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agomake: Document imported variables
Chad Versace [Fri, 26 Aug 2011 22:48:29 +0000 (15:48 -0700)]
make: Document imported variables

In src/mesa/Android.mk, it is non-trivial to determine which variables are
imported by `include sources.mak`. So document them.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agomesa: Build libmesa_dricore.a for Android
Chad Versace [Fri, 26 Aug 2011 20:29:20 +0000 (13:29 -0700)]
mesa: Build libmesa_dricore.a for Android

libmesa_dricore.a is analogous to the libmesa.a built by the Autoconf
build.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agotnl: fix regression in bind_indices()
Brian Paul [Tue, 30 Aug 2011 15:49:00 +0000 (09:49 -0600)]
tnl: fix regression in bind_indices()

Commit 2ea1ff38164d95f8291ef2e5dfe2cb13936a60f2 caused the regression.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=40413

13 years agotnl: add const qualifier to silence warning
Brian Paul [Tue, 30 Aug 2011 15:47:25 +0000 (09:47 -0600)]
tnl: add const qualifier to silence warning

13 years agotnl: use buffer helper functions to improve readbility
Brian Paul [Tue, 30 Aug 2011 15:44:47 +0000 (09:44 -0600)]
tnl: use buffer helper functions to improve readbility

13 years agomake: Factor out source lists from drivers/dri/common into Makefile.sources
Chad Versace [Fri, 26 Aug 2011 00:55:42 +0000 (17:55 -0700)]
make: Factor out source lists from drivers/dri/common into Makefile.sources

In order that the Autoconf and Android build can share the same source
lists, move the lists from
    src/mesa/drivers/dri/Makefile.defines
into
    src/mesa/drivers/dri/common/Makefile.sources

I would like for Android to just reuse Makefile.defines, but the file is
unsuitable for reuse.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off: Chad Versace <chad@chad-versace.us>

13 years agomake: Remove duplicate occurence of driverfuncs.c
Chad Versace [Fri, 26 Aug 2011 03:32:13 +0000 (20:32 -0700)]
make: Remove duplicate occurence of driverfuncs.c

driverfuncs.o is already contained in libmesa.a, so remove it from the
following source lists:
    src/mesa/drivers/dri/Makefiles.defines:COMMON_SOURCES.
    src/mesa/drivers/dri/swrast/Makefile:SWRAST_COMMON_SOURCES

Reviewed-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agomake: Remove duplicate defintion of COMMON_SOURCES in Radeon makefiles
Chad Versace [Sun, 28 Aug 2011 14:58:28 +0000 (07:58 -0700)]
make: Remove duplicate defintion of COMMON_SOURCES in Radeon makefiles

Remove defintion of COMMON_SOURCES from {r300,r660}/Makefile. The
defintion is a duplicate of that found in
src/mesa/drivers/dri/Makefile.defines.

Reviewed-by: Ian Romanick <idr@freedesktop.org>
Signed-off-by: Chad Versace <chad@chad-versace.us>
13 years agor600g: Make unaligned 3D textures work on +evergreen
Christian König [Mon, 29 Aug 2011 10:14:30 +0000 (12:14 +0200)]
r600g: Make unaligned 3D textures work on +evergreen

The layersize calculation is slightly different on +evergreen.
This makes mpeg2 video decoding and piglits texture-packed-formats
test work correctly on this hardware.

13 years agonouveau: use PRIu64 for printing uint64_t
Christoph Bumiller [Tue, 30 Aug 2011 12:41:13 +0000 (14:41 +0200)]
nouveau: use PRIu64 for printing uint64_t

13 years agonouveau/mm: move slabs to correct list on memory release
Christoph Bumiller [Tue, 30 Aug 2011 12:29:23 +0000 (14:29 +0200)]
nouveau/mm: move slabs to correct list on memory release

Should get rid of "destroying GPU memory cache with some buffers
still in use" message.

13 years agowinsys/radeon: Create async thread only once
Maarten Lankhorst [Sat, 27 Aug 2011 20:57:19 +0000 (22:57 +0200)]
winsys/radeon: Create async thread only once

I noticed that a thread was created for every time async flush was called, so I moved it and used some semaphores to synch.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Christian König <deathsimple@vodafone.de>
13 years agonvfx: use common NOUVEAU_RESOURCE_FLAG_LINEAR define
Christoph Bumiller [Tue, 30 Aug 2011 11:44:31 +0000 (13:44 +0200)]
nvfx: use common NOUVEAU_RESOURCE_FLAG_LINEAR define

13 years agonv50: add support for linear textures and render targets
Christoph Bumiller [Tue, 30 Aug 2011 11:08:27 +0000 (13:08 +0200)]
nv50: add support for linear textures and render targets

13 years agonv50: align pitch of linear surfaces correctly
Christoph Bumiller [Tue, 30 Aug 2011 11:06:03 +0000 (13:06 +0200)]
nv50: align pitch of linear surfaces correctly

13 years agonv50: handle TGSI_OPCODE_ROUND
Christoph Bumiller [Sat, 27 Aug 2011 19:00:39 +0000 (21:00 +0200)]
nv50: handle TGSI_OPCODE_ROUND

Will round to nearest-even.

13 years agonv50,nvc0: add states mask to state validation function
Christoph Bumiller [Sat, 27 Aug 2011 18:49:36 +0000 (20:49 +0200)]
nv50,nvc0: add states mask to state validation function

This prevents null dereferences in validation of interdependent
state after a switch to a pipe context where we mark all state
as dirty but where not all state is valid / set yet.

13 years agonv50,nvc0: reject R8G8B8A8/X8_UNORM for multisample surfaces
Christoph Bumiller [Sat, 27 Aug 2011 15:31:04 +0000 (17:31 +0200)]
nv50,nvc0: reject R8G8B8A8/X8_UNORM for multisample surfaces

The window system buffer will be BGRA and applications will try to
directly resolve to it, which would trigger an INVALID_OPERATION in
BlitFramebuffer if the multisample renderbuffer is RGBA.

13 years agomesa: update multisample state on _NEW_BUFFERS
Christoph Bumiller [Sat, 27 Aug 2011 15:28:01 +0000 (17:28 +0200)]
mesa: update multisample state on _NEW_BUFFERS

A change in sampleBuffers affects the final enable value.

13 years agoglu: Avoid defining conflicting DEBUG NDEBUG macros.
José Fonseca [Mon, 29 Aug 2011 13:18:26 +0000 (14:18 +0100)]
glu: Avoid defining conflicting DEBUG NDEBUG macros.

13 years agoglu: Fix build on mingw-w64.
José Fonseca [Mon, 29 Aug 2011 13:18:06 +0000 (14:18 +0100)]
glu: Fix build on mingw-w64.

13 years agoRemove dead Makefiles.
José Fonseca [Mon, 29 Aug 2011 12:59:18 +0000 (13:59 +0100)]
Remove dead Makefiles.

13 years agodocs: Update scons info regarding mingw.
José Fonseca [Mon, 29 Aug 2011 12:56:20 +0000 (13:56 +0100)]
docs: Update scons info regarding mingw.

13 years agoRemote *.mgw stuff.
José Fonseca [Mon, 29 Aug 2011 12:35:49 +0000 (13:35 +0100)]
Remote *.mgw stuff.

Totally broken, and deprecated by scons.

13 years agolibgl-gdi: Fix mingw-w64 build.
José Fonseca [Mon, 29 Aug 2011 12:28:41 +0000 (13:28 +0100)]
libgl-gdi: Fix mingw-w64 build.

Mingw-w64 actually seems to be closer to MSVC in terms of .DEF parsing.

13 years agost/wgl: Fix build on mingw-w64
José Fonseca [Mon, 29 Aug 2011 12:28:02 +0000 (13:28 +0100)]
st/wgl: Fix build on mingw-w64

Which already declares wglSwapMultipleBuffers and WGLSWAP.

13 years agogdi: Remove mesa_wgl.h
José Fonseca [Mon, 29 Aug 2011 12:26:36 +0000 (13:26 +0100)]
gdi: Remove mesa_wgl.h

All commonly used windows toolchains define wgl entrypoints in the windows
headers, and mesa_wgl.h not only is unnecessary but actually often stands
in the waydue to slight inconsistencies.

So remove it.

13 years agoscons: Prefer x86_64-w64-mingw32- prefix.
José Fonseca [Mon, 29 Aug 2011 12:21:24 +0000 (13:21 +0100)]
scons: Prefer x86_64-w64-mingw32- prefix.

This allows to use mingw-w64 binaries on debian systems which already
include a (typically incomplete) 64 cross compiler.

13 years agoxorg/xvmc: Only set decode buffer when available
Maarten Lankhorst [Sat, 27 Aug 2011 23:58:23 +0000 (01:58 +0200)]
xorg/xvmc: Only set decode buffer when available

The nouveau xvmc decoder doesn't need it.

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
13 years agoglsl_to_tgsi: fix a reference leak on an error path
Marek Olšák [Thu, 25 Aug 2011 02:11:05 +0000 (04:11 +0200)]
glsl_to_tgsi: fix a reference leak on an error path

13 years agoi965: Avoid generating MOVs for most ir_assignment handling.
Kenneth Graunke [Fri, 26 Aug 2011 19:24:43 +0000 (12:24 -0700)]
i965: Avoid generating MOVs for most ir_assignment handling.

This is a port of vec4_visitor::try_rewrite_rhs_to_dst to fs_visitor.

Not only is this technique less invasive and more robust, it also
generates better code.  Over and above the previous technique, this
reduced instruction count in shader-db by 0.28% on average and 1.4% in
the best case.

In no case did this technique result in more code than the prior method.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
13 years agoi965/fs: Revert "Avoid generating MOVs for assignments for expressions."
Kenneth Graunke [Fri, 26 Aug 2011 19:05:07 +0000 (12:05 -0700)]
i965/fs: Revert "Avoid generating MOVs for assignments for expressions."

This reverts commit 53c89c67f33639afef951e178f93f4e29acc5d53, along with
the subsequent this->result = reg_undef additions it required.

Both Eric and I agree that the way he did this is really fragile; if you
forget to add this->result = reg_undef before calling accept(), it may
end up using the same register for two separate things, breaking things
in strange and mysterious ways.

The next commit will port over the new VS backend's method for solving
this problem, which is simpler, less intrusive, and still manages to
avoid MOVs in the common case.

13 years agomesa: Remove all mention of MESA_FORMAT_CI8
Ian Romanick [Fri, 26 Aug 2011 19:20:00 +0000 (12:20 -0700)]
mesa: Remove all mention of MESA_FORMAT_CI8

Nothing in Mesa supports color-index textures, and most of the other
infrastructure that could allow such support has already been removed.
This puts the final nail in the coffin.

Also clean out some GL_COLOR_INDEX comments in formats.c.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agodri: Remove MESA_FORMAT_CI8 bits from drivers that don't do paletted textures
Ian Romanick [Mon, 20 Sep 2010 14:03:34 +0000 (07:03 -0700)]
dri: Remove MESA_FORMAT_CI8 bits from drivers that don't do paletted textures

This came from the "kill it with fire" discussion at XDS 2010.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
13 years agoscons: add swrast/s_texture.c to the build
Brian Paul [Mon, 29 Aug 2011 17:37:13 +0000 (11:37 -0600)]
scons: add swrast/s_texture.c to the build

13 years agointel: Rely on Mesa core for the non-blit glTexSubImage* implementation.
Eric Anholt [Mon, 1 Aug 2011 21:37:19 +0000 (14:37 -0700)]
intel: Rely on Mesa core for the non-blit glTexSubImage* implementation.

It uses MapTextureImage() now, so we don't need our own mapping.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Convert texture debug dump function to using MapTextureImage().
Brian Paul [Mon, 1 Aug 2011 03:14:54 +0000 (20:14 -0700)]
mesa: Convert texture debug dump function to using MapTextureImage().

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agointel: Remove our custom _mesa_store_compressed_texsubimage2d().
Eric Anholt [Fri, 29 Jul 2011 23:40:29 +0000 (16:40 -0700)]
intel: Remove our custom _mesa_store_compressed_texsubimage2d().

Now that Mesa core knows how to map teximages, we no longer needed the
compressed paths here.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Convert texstore.c to accessing textures using MapTextureImage.
Brian Paul [Fri, 29 Jul 2011 23:25:23 +0000 (16:25 -0700)]
mesa: Convert texstore.c to accessing textures using MapTextureImage.

This continues to allocate texImage->Data as before, so
drivers calling these functions need to use that when present.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agonouveau: Add MapTextureImage() implementation.
Eric Anholt [Mon, 15 Aug 2011 17:20:25 +0000 (10:20 -0700)]
nouveau: Add MapTextureImage() implementation.

This is untested, but should be close to working since it's basically
a copy of nouveau_teximage_map().

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoradeon: Add MapTextureImage() implementation.
Eric Anholt [Mon, 1 Aug 2011 15:43:07 +0000 (08:43 -0700)]
radeon: Add MapTextureImage() implementation.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoradeon: Refactor the common texture hook setup to common code.
Eric Anholt [Mon, 1 Aug 2011 15:46:47 +0000 (08:46 -0700)]
radeon: Refactor the common texture hook setup to common code.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agoswrast: Add implementation of MapTextureImage/UnmapTextureImage.
Brian Paul [Fri, 29 Jul 2011 22:30:21 +0000 (15:30 -0700)]
swrast: Add implementation of MapTextureImage/UnmapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agointel: Add implementation of MapTextureImage/UnmapTextureImage.
Eric Anholt [Fri, 29 Jul 2011 21:35:01 +0000 (14:35 -0700)]
intel: Add implementation of MapTextureImage/UnmapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agost/mesa: Add implementation of MapTextureImage.
Brian Paul [Sat, 30 Jul 2011 00:25:38 +0000 (17:25 -0700)]
st/mesa: Add implementation of MapTextureImage.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Add driver hooks for texture image mapping/unmapping.
Brian Paul [Fri, 15 Jul 2011 02:57:34 +0000 (20:57 -0600)]
mesa: Add driver hooks for texture image mapping/unmapping.

ctx->Driver.MapTextureImage() / UnmapTextureImage() will be called by
the glTex[Sub]Image(), glGetTexImage() functions, etc. when we're
accessing texture data, and also for software rendering when accessing
texture data.

Reviewed-by: Brian Paul <brianp@vmware.com>
13 years agomesa: Don't check for image->Data when freeing an image's contents.
Eric Anholt [Wed, 27 Jul 2011 21:40:08 +0000 (14:40 -0700)]
mesa: Don't check for image->Data when freeing an image's contents.

All driver implementations of FreeTextureImageBuffer already check
that Data != NULL and free it.  However, this means that we will also
free driver storage if the driver storage wasn't in the form of a Data
pointer.

This was produced by the following semantic patch:

@@
expression C;
expression T;
@@
- if (T->Data) {
- C->Driver.FreeTextureImageBuffer(C, T);
+ C->Driver.FreeTextureImageBuffer(C, T);
- }

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoRename some driver FreeTextureImageData functions to FreeTextureImageBuffer.
Eric Anholt [Wed, 27 Jul 2011 19:56:07 +0000 (12:56 -0700)]
Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agomesa: Rename FreeTexImageData to FreeTextureImageBuffer.
Eric Anholt [Wed, 27 Jul 2011 19:29:48 +0000 (12:29 -0700)]
mesa: Rename FreeTexImageData to FreeTextureImageBuffer.

This was produced by sed, except for one hunk in driverfuncs.c where
trailing whitespace was dropped.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
13 years agoi915g: remove unused var in i915_flush_heuristically()
Brian Paul [Mon, 29 Aug 2011 14:11:50 +0000 (08:11 -0600)]
i915g: remove unused var in i915_flush_heuristically()

13 years agowinsys/g3dvl: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:59 +0000 (17:51 +0200)]
winsys/g3dvl: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agotests/unit: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:58 +0000 (17:51 +0200)]
tests/unit: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agotargets/xorg-vmwgfx: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:57 +0000 (17:51 +0200)]
targets/xorg-vmwgfx: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agost/xorg: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:56 +0000 (17:51 +0200)]
st/xorg: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agovdpau: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:55 +0000 (17:51 +0200)]
vdpau: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agova: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:54 +0000 (17:51 +0200)]
va: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agod3d1x: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:53 +0000 (17:51 +0200)]
d3d1x: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agoinclude/pipe: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:52 +0000 (17:51 +0200)]
include/pipe: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agor600g: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:51 +0000 (17:51 +0200)]
r600g: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agonoop: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:50 +0000 (17:51 +0200)]
noop: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agovl: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:49 +0000 (17:51 +0200)]
vl: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agoutil: Fix include style
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:48 +0000 (17:51 +0200)]
util: Fix include style

As explained in the thread starting at [0], the internal include style
should be »#include "path/to/header.h"« for non-system includes.

[0]
<http://news.gmane.org/find-root.php?message_id=%3c4E5802BE.6020206%40vmware.com%3e>

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agodocs: Fix minor typos.
Kai Wasserbäch [Sat, 27 Aug 2011 15:51:47 +0000 (17:51 +0200)]
docs: Fix minor typos.

dbec3a5d introduced minor typos, this should fix them.

Signed-off-by: Kai Wasserbäch <kai@dev.carbon-project.org>
Signed-off-by: Brian Paul <brianp@vmware.com>
13 years agog3dvl: Fix a bug not decoding the last 32-64 bits of an mpeg2 bitstream.
Christian König [Mon, 29 Aug 2011 08:36:06 +0000 (10:36 +0200)]
g3dvl: Fix a bug not decoding the last 32-64 bits of an mpeg2 bitstream.

Another bug found by Andy Furniss.

13 years agost/vdpau: Respect source_rect in VideoMixerRender
Christian König [Sun, 28 Aug 2011 11:52:44 +0000 (13:52 +0200)]
st/vdpau: Respect source_rect in VideoMixerRender

Fixing a bug reported by Andy Furniss.

13 years agoegl: Use gbm/wayland flags regardless of egl_dri2
Benjamin Franzke [Mon, 29 Aug 2011 07:21:30 +0000 (09:21 +0200)]
egl: Use gbm/wayland flags regardless of egl_dri2

Since they are needed for display autodetection.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40443

13 years agoxvmc tests: Clean up test_rendering slightly
Maarten Lankhorst [Sat, 27 Aug 2011 23:56:30 +0000 (01:56 +0200)]
xvmc tests: Clean up test_rendering slightly

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
13 years agoandroid: add support for egl_dri2
Chia-I Wu [Fri, 19 Aug 2011 09:11:34 +0000 (17:11 +0800)]
android: add support for egl_dri2

Add rules to build egl_dri2 and make it a built-in EGL driver of
libGLES_mesa.

Reviewed-by: Chad Versace <chad@chad-versace.us>
13 years agoegl_dri2: add support for Android
Chia-I Wu [Fri, 5 Aug 2011 05:39:18 +0000 (14:39 +0900)]
egl_dri2: add support for Android

Add platform_android.c that supports _EGL_PLAFORM_ANDROID.  It works
with drm_gralloc, where back buffers of windows are backed by GEM
objects.

In Android a native window has a queue of back buffers allocated by the
server, through drm_gralloc.  For each frame, EGL needs to

  dequeue the next back buffer
  render to the buffer
  enqueue the buffer

After enqueuing, the buffer is no longer valid to EGL.  A window has no
depth buffer or other aux buffers.  They need to be allocated locally by
EGL.

Reviewed-by: Benjamin Franzke <benjaminfranzke@googlemail.com>
Reviewed-by: Chad Versace <chad@chad-versace.us>
[olv: with assorted minor changes, mostly suggested during the review]

13 years agoegl_dri2: allow RGBA masks to be specified for matching
Chia-I Wu [Fri, 5 Aug 2011 05:36:14 +0000 (14:36 +0900)]
egl_dri2: allow RGBA masks to be specified for matching

Add rgba_masks to dri2_add_config.  When it is non-NULL, the DRI config
is accepted only when the offsets and sizes of the its channels match
rgba_mask.

Reviewed-by: Chad Versace <chad@chad-versace.us>
13 years agoglsl_to_tgsi: remove unused code
Marek Olšák [Wed, 24 Aug 2011 21:58:43 +0000 (23:58 +0200)]
glsl_to_tgsi: remove unused code

13 years agoandroid: make DRM optional
Chia-I Wu [Thu, 25 Aug 2011 13:36:19 +0000 (21:36 +0800)]
android: make DRM optional

For BOARD_GPU_DRIVERS=swrast build, DRM is not needed.

13 years agoandroid: add support for nouveau
Chia-I Wu [Mon, 22 Aug 2011 03:21:31 +0000 (11:21 +0800)]
android: add support for nouveau

Compile tested only.

13 years agoandroid: add support for r300g
Chia-I Wu [Mon, 22 Aug 2011 02:45:29 +0000 (10:45 +0800)]
android: add support for r300g

Compile tested only.

13 years agoandroid: add support for i915g
Chia-I Wu [Mon, 22 Aug 2011 03:04:46 +0000 (11:04 +0800)]
android: add support for i915g

Quickly tested with 945GME.  SurfaceFlinger (the display server and
compositor) works.  2D apps with RGB or RGBA visuals work.  As for 3D
apps, some work and some do not.

13 years agoandroid: add support for vmwgfx
Chia-I Wu [Mon, 22 Aug 2011 03:14:33 +0000 (11:14 +0800)]
android: add support for vmwgfx

Quickly tested with VMWare Workstation 7.1.4 on Linux with GeForce
GT220.  SurfaceFlinger (the display server and compositor) works.  2D
apps with RGB visual works.  However, due to missing
PIPE_FORMAT_R8G8B8A8_UNORM support, those with RGBA visual do not.

13 years agowinsys/i915: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:09:20 +0000 (11:09 +0800)]
winsys/i915: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agowinsys/svga: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:18:15 +0000 (11:18 +0800)]
winsys/svga: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agonouveau: share the source lists
Chia-I Wu [Mon, 22 Aug 2011 03:30:27 +0000 (11:30 +0800)]
nouveau: share the source lists

For each driver, factor out C_SOURCES from Makefile to Makefile.sources,
and let Makefile and SConscript share it.

13 years agor300g: share the source list
Chia-I Wu [Mon, 22 Aug 2011 02:53:10 +0000 (10:53 +0800)]
r300g: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

Note that

  $(TOP)/src/glsl/ralloc.c and
  $(TOP)/src/mesa/program/register_allocate.c

are removed from C_SOURCES in Makefile.sources and added back in
Makefile and SConscript.  The idea is that they are not part of r300g.
But having them in libr300.a makes build non-GL targets such as the
compiler tests or g3dvl much easier.  Also, for practical reason, TOP
would be an undefined variable in Makefile.sources.

13 years agoi915g: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:07:26 +0000 (11:07 +0800)]
i915g: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agosvga: share the source list
Chia-I Wu [Mon, 22 Aug 2011 03:16:33 +0000 (11:16 +0800)]
svga: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

13 years agotargets/egl-static: fix nouveau and vmwgfx for Android
Chia-I Wu [Fri, 26 Aug 2011 03:30:47 +0000 (11:30 +0800)]
targets/egl-static: fix nouveau and vmwgfx for Android

drmVersion and driver specific ioctls are used to get the PCI ID from a
DRM fd.  Eexpand the mechanism to nouveau and vmwgfx, except that for
nouveau, only the vendor ID is needed, and for vmwgfx, always assume
SVGA II.

13 years agopci_ids: add vmwgfx pci id list
Chia-I Wu [Wed, 24 Aug 2011 05:48:25 +0000 (13:48 +0800)]
pci_ids: add vmwgfx pci id list

There is only one chipset

 15ad:0405 VMware SVGA II Adapter

13 years agomapi: Commit generated files modified by previous commit
Ian Romanick [Fri, 26 Aug 2011 00:31:03 +0000 (17:31 -0700)]
mapi: Commit generated files modified by previous commit

Some of the changes are spurious because somebody forgot to do this
when adding glFramebufferTextureLayerARB.

13 years agomapi: Silence many "warning: unused parameter"
Ian Romanick [Fri, 26 Aug 2011 00:27:08 +0000 (17:27 -0700)]
mapi: Silence many "warning: unused parameter"

When generating dispatch templates, emit the '(void) blah;' magic to
make GCC happy.  This reduces a lot of warning spam if you build with
-Wunused-parameter or -Wextra.

Reviewed-by: Chia-I Wu <olv@lunarg.com>
13 years agomesa/tnl_dd: Remove unused source tree mesa/tnl_dd/imm
Ian Romanick [Thu, 25 Aug 2011 20:54:46 +0000 (13:54 -0700)]
mesa/tnl_dd: Remove unused source tree mesa/tnl_dd/imm

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa/tnl_dd: Remove unused header file t_dd_vbtmp.h
Ian Romanick [Thu, 25 Aug 2011 20:51:57 +0000 (13:51 -0700)]
mesa/tnl_dd: Remove unused header file t_dd_vbtmp.h

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa/tnl_dd: Remove unused header file t_dd_rendertmp.h
Ian Romanick [Thu, 25 Aug 2011 20:45:02 +0000 (13:45 -0700)]
mesa/tnl_dd: Remove unused header file t_dd_rendertmp.h

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agomesa: Remove support for BeOS
Ian Romanick [Thu, 25 Aug 2011 15:25:09 +0000 (08:25 -0700)]
mesa: Remove support for BeOS

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove unused header files mmx.h and spantmp.h
Ian Romanick [Wed, 24 Aug 2011 23:18:43 +0000 (16:18 -0700)]
dri: Remove unused header files mmx.h and spantmp.h

These header files were only used by drivers removed in a previous commit.

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove driRenderbuffer::backBuffer field
Ian Romanick [Wed, 24 Aug 2011 22:40:49 +0000 (15:40 -0700)]
dri: Remove driRenderbuffer::backBuffer field

The tdfx driver was the only user.

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
13 years agodri: Remove all DRI1 drivers
Ian Romanick [Wed, 24 Aug 2011 22:21:58 +0000 (15:21 -0700)]
dri: Remove all DRI1 drivers

Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>