mesa.git
14 years agoegl: Correctly unbind contexts in eglReleaseThread.
Chia-I Wu [Thu, 28 Jan 2010 08:49:40 +0000 (16:49 +0800)]
egl: Correctly unbind contexts in eglReleaseThread.

MakeCurrent unbinds the current context of the current API.  Modify the
current API to make sure all contexts are correctly unbound.

14 years agoegl: eglMakeCurrent should accept an uninitialized display.
Chia-I Wu [Wed, 27 Jan 2010 15:51:54 +0000 (23:51 +0800)]
egl: eglMakeCurrent should accept an uninitialized display.

When no context or surface are given, the display is allowed to be
uninitialized.  Most drivers cannot handle an uninitialized display.
But they are updated to at least throw a fatal message.

14 years agoegl: Add _eglBindContext.
Chia-I Wu [Wed, 27 Jan 2010 15:31:20 +0000 (23:31 +0800)]
egl: Add _eglBindContext.

It works similar to _eglMakeCurrent, except that the old context and
surfaces are returned instead of destroyed.  _eglMakeCurrent is now
calling the new _eglBindContext.

14 years agoegl: Use a boolean to indicate whether a display is initialized.
Chia-I Wu [Wed, 27 Jan 2010 15:55:58 +0000 (23:55 +0800)]
egl: Use a boolean to indicate whether a display is initialized.

The driver pointer of the display was used to decide whether a display
is initialized.  Use a boolean for that purpose allows accessing the
driver of an uninitialized display.

14 years agoscons: Fix GLEW build on Mac OS X.
Vinson Lee [Thu, 28 Jan 2010 09:19:53 +0000 (01:19 -0800)]
scons: Fix GLEW build on Mac OS X.

14 years agotgsi: Silence uninitialized variable warning.
Vinson Lee [Thu, 28 Jan 2010 08:40:43 +0000 (00:40 -0800)]
tgsi: Silence uninitialized variable warning.

14 years agoradeon: Silence "format" compiler warnings.
Vinson Lee [Thu, 28 Jan 2010 08:33:30 +0000 (00:33 -0800)]
radeon: Silence "format" compiler warnings.

14 years agost/xorg: Remove unnecessary headers.
Vinson Lee [Thu, 28 Jan 2010 08:25:20 +0000 (00:25 -0800)]
st/xorg: Remove unnecessary headers.

14 years agost/dri: Remove unnecessary headers.
Vinson Lee [Thu, 28 Jan 2010 08:20:22 +0000 (00:20 -0800)]
st/dri: Remove unnecessary headers.

14 years agollvmpipe: Remove unnecessary headers.
Vinson Lee [Thu, 28 Jan 2010 02:08:37 +0000 (18:08 -0800)]
llvmpipe: Remove unnecessary headers.

14 years agoswrast: s/FIXED_TO_FLOAT/FixedToFloat/
Brian Paul [Thu, 28 Jan 2010 00:48:15 +0000 (17:48 -0700)]
swrast: s/FIXED_TO_FLOAT/FixedToFloat/

14 years agor300g: Remove unnecessary headers.
Vinson Lee [Thu, 28 Jan 2010 00:11:23 +0000 (16:11 -0800)]
r300g: Remove unnecessary headers.

14 years agomesa: fix int/uint comparison warnings
Brian Paul [Thu, 28 Jan 2010 00:03:48 +0000 (17:03 -0700)]
mesa: fix int/uint comparison warnings

Reported by Karl Schultz.

14 years agomesa: fix double->float assignment warnings, int/uint comparison warnings
Brian Paul [Thu, 28 Jan 2010 00:03:04 +0000 (17:03 -0700)]
mesa: fix double->float assignment warnings, int/uint comparison warnings

Reported by Karl Schultz.

14 years agomesa: fix double->float assignment warnings
Brian Paul [Thu, 28 Jan 2010 00:02:29 +0000 (17:02 -0700)]
mesa: fix double->float assignment warnings

Reported by Karl Schultz.

14 years agomesa: fix int/uint comparison warnings
Brian Paul [Thu, 28 Jan 2010 00:01:54 +0000 (17:01 -0700)]
mesa: fix int/uint comparison warnings

Reported by Karl Schultz.

14 years agotnl: fix double->float and int/uint conversion warnings
Brian Paul [Thu, 28 Jan 2010 00:01:10 +0000 (17:01 -0700)]
tnl: fix double->float and int/uint conversion warnings

Reported by Karl Schultz.

14 years agoswrast: silence double->float assignment warnings
Brian Paul [Thu, 28 Jan 2010 00:00:32 +0000 (17:00 -0700)]
swrast: silence double->float assignment warnings

Reported by Karl Schultz.

14 years agomesa: more info in glActiveTexture error msg
Brian Paul [Thu, 28 Jan 2010 00:00:15 +0000 (17:00 -0700)]
mesa: more info in glActiveTexture error msg

14 years agoconfigs: added vega to default GALLIUM_STATE_TRACKERS_DIRS
Brian Paul [Wed, 27 Jan 2010 00:31:06 +0000 (17:31 -0700)]
configs: added vega to default GALLIUM_STATE_TRACKERS_DIRS

14 years agoi965g: Remove unnecessary headers.
Vinson Lee [Wed, 27 Jan 2010 23:54:21 +0000 (15:54 -0800)]
i965g: Remove unnecessary headers.

14 years agoutil: Remove unnecessary header.
Vinson Lee [Wed, 27 Jan 2010 23:35:58 +0000 (15:35 -0800)]
util: Remove unnecessary header.

14 years agotgsi: Remove unnecessary header.
Vinson Lee [Wed, 27 Jan 2010 23:32:48 +0000 (15:32 -0800)]
tgsi: Remove unnecessary header.

14 years agogallium/draw: Remove unnecessary headers.
Vinson Lee [Wed, 27 Jan 2010 23:06:13 +0000 (15:06 -0800)]
gallium/draw: Remove unnecessary headers.

14 years agor300g: Silence GCC "missing braces around initializer" warning.
Vinson Lee [Wed, 27 Jan 2010 22:04:53 +0000 (14:04 -0800)]
r300g: Silence GCC "missing braces around initializer" warning.

14 years agor600: fix warning
Alex Deucher [Wed, 27 Jan 2010 17:18:02 +0000 (12:18 -0500)]
r600: fix warning

14 years agor600: rv670 support 8 tex instructions just like other r6xx
Alex Deucher [Wed, 27 Jan 2010 17:16:50 +0000 (12:16 -0500)]
r600: rv670 support 8 tex instructions just like other r6xx

also clarify some other const values.

14 years agocell: remove commas from structs wrapped in PIPE_ALIGN_TYPE macro
Brian Paul [Wed, 27 Jan 2010 16:21:57 +0000 (09:21 -0700)]
cell: remove commas from structs wrapped in PIPE_ALIGN_TYPE macro

This avoids the need to make PIPE_ALIGN_TYPE a variadic macro.

14 years agoDuplicate CCVERSION check code to compensate for different env CC.
Alan Hourihane [Wed, 27 Jan 2010 12:46:46 +0000 (12:46 +0000)]
Duplicate CCVERSION check code to compensate for different env CC.

14 years agor600: increase max texture units to 16
Andre Maasikas [Wed, 27 Jan 2010 09:22:56 +0000 (11:22 +0200)]
r600: increase max texture units to 16

14 years agor600: fix XPD with writemask
Andre Maasikas [Wed, 27 Jan 2010 08:20:15 +0000 (10:20 +0200)]
r600: fix XPD with writemask

same variable used for 2 different temp registers
fixes e.g. glsl/bump

14 years agosoftpipe: Remove unnecessary header.
Vinson Lee [Wed, 27 Jan 2010 07:28:23 +0000 (23:28 -0800)]
softpipe: Remove unnecessary header.

14 years agoi915g: Remove unnecessary headers.
Vinson Lee [Wed, 27 Jan 2010 07:26:41 +0000 (23:26 -0800)]
i915g: Remove unnecessary headers.

14 years agoscons: Use '-Werror=' option on GCC 4.2.x and greater.
Vinson Lee [Wed, 27 Jan 2010 06:56:58 +0000 (22:56 -0800)]
scons: Use '-Werror=' option on GCC 4.2.x and greater.

The existing code only checked for GCC 4.2.x and 4.3.x.

14 years agor300g: Turn the RS block into an atom.
Corbin Simpson [Wed, 27 Jan 2010 06:08:11 +0000 (22:08 -0800)]
r300g: Turn the RS block into an atom.

At least one extraneous dirty was eliminated, as well as the chance for
avoiding dirty on shader change.

14 years agor300g: Make vertex_format into an atom.
Corbin Simpson [Wed, 27 Jan 2010 05:49:02 +0000 (21:49 -0800)]
r300g: Make vertex_format into an atom.

Some delicious hax here.

14 years agor300g: Kill dead code for hashing custom state.
Corbin Simpson [Wed, 27 Jan 2010 05:41:44 +0000 (21:41 -0800)]
r300g: Kill dead code for hashing custom state.

It just wasn't meant to be.

14 years agor300g: Add A8_UNORM texture format.
Corbin Simpson [Wed, 27 Jan 2010 04:11:39 +0000 (20:11 -0800)]
r300g: Add A8_UNORM texture format.

Keeps teeworld happy.

14 years agoradeon/r200/r300: don't clean non-emitted state.
Dave Airlie [Wed, 27 Jan 2010 01:46:26 +0000 (11:46 +1000)]
radeon/r200/r300: don't clean non-emitted state.

So if we don't actually emit an atom to the hw because we don't
need it in the current state (e.g. lighting related atoms when
lighting is off) then don't mark it as clean, because when
lighting gets switched on we won't emit it at all.

This fixes funky gears colors.

Signed-off-by: Dave Airlie <airlied@redhat.com>
14 years agoradeon: remove unused file
Dave Airlie [Wed, 27 Jan 2010 01:02:32 +0000 (11:02 +1000)]
radeon: remove unused file

14 years agointel: Remove dead code from having to clip copyteximage source rect.
Eric Anholt [Wed, 27 Jan 2010 02:04:03 +0000 (18:04 -0800)]
intel: Remove dead code from having to clip copyteximage source rect.

mesa core does it now.  If only it did so for other entrypoints.

14 years agointel: Use a handy helper in glReadPixels source clipping.
Eric Anholt [Wed, 27 Jan 2010 02:01:37 +0000 (18:01 -0800)]
intel: Use a handy helper in glReadPixels source clipping.

14 years agointel: Clean up stale comments about cliprects.
Eric Anholt [Wed, 27 Jan 2010 01:47:03 +0000 (17:47 -0800)]
intel: Clean up stale comments about cliprects.

14 years agointel: Remove the remaining cliprects code from DRI1.
Eric Anholt [Wed, 27 Jan 2010 01:40:44 +0000 (17:40 -0800)]
intel: Remove the remaining cliprects code from DRI1.

14 years agointel: Remove DRI1 junk from spans code.
Eric Anholt [Wed, 27 Jan 2010 01:36:35 +0000 (17:36 -0800)]
intel: Remove DRI1 junk from spans code.

This reduces the driver size by over 1%.

14 years agointel: Remove DRI1 junk from blit glBitmap.
Eric Anholt [Wed, 27 Jan 2010 01:11:11 +0000 (17:11 -0800)]
intel: Remove DRI1 junk from blit glBitmap.

14 years agointel: Remove DRI1 junk from CopyPixels.
Eric Anholt [Wed, 27 Jan 2010 01:02:55 +0000 (17:02 -0800)]
intel: Remove DRI1 junk from CopyPixels.

14 years agointel: Remove DRI1 junk from glClear blit implementation.
Eric Anholt [Wed, 27 Jan 2010 00:40:05 +0000 (16:40 -0800)]
intel: Remove DRI1 junk from glClear blit implementation.

14 years agoi965: Remove DRI1 leftovers from stipple offset handling.
Eric Anholt [Wed, 27 Jan 2010 00:35:27 +0000 (16:35 -0800)]
i965: Remove DRI1 leftovers from stipple offset handling.

14 years agoi965g: Silence uninitialized variable warning.
Vinson Lee [Wed, 27 Jan 2010 01:00:15 +0000 (17:00 -0800)]
i965g: Silence uninitialized variable warning.

14 years agosoftpipe: Remove unused variables.
Vinson Lee [Wed, 27 Jan 2010 00:45:32 +0000 (16:45 -0800)]
softpipe: Remove unused variables.

14 years agost/mesa: Silence uninitialized variable warning.
Vinson Lee [Wed, 27 Jan 2010 00:37:10 +0000 (16:37 -0800)]
st/mesa: Silence uninitialized variable warning.

14 years agointel: Fix PBO blit ReadPixels from an FBO.
Eric Anholt [Wed, 27 Jan 2010 00:22:10 +0000 (16:22 -0800)]
intel: Fix PBO blit ReadPixels from an FBO.

Bug #25921 -- clutter PBO usage gave unreliable results.

14 years agodocs: add documentation to double opcodes
Igor Oliveira [Mon, 25 Jan 2010 23:23:04 +0000 (19:23 -0400)]
docs: add documentation to double opcodes

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agoi965: Add support for EXT_draw_buffers2.
Eric Anholt [Tue, 26 Jan 2010 22:43:23 +0000 (14:43 -0800)]
i965: Add support for EXT_draw_buffers2.

14 years agoi965: Fix fp fragment.position handling and enable HW part of ARB_fcc.
Eric Anholt [Tue, 26 Jan 2010 21:08:42 +0000 (13:08 -0800)]
i965: Fix fp fragment.position handling and enable HW part of ARB_fcc.

As with swrast, this fixes the default pixel center behavior which was
broken, and implements the previous behavior for integer.  Fixes
piglit fp-arb-fragment-coord-conventions-none.  The extension won't be
exposed until we get the GLSL part implemented.

The DRI1 origin_x/y parts are dropped since they're no longer relevant.

14 years agoswrast: Implement ARB_fragment_coord_conventions but don't enable.
Eric Anholt [Tue, 26 Jan 2010 20:43:43 +0000 (12:43 -0800)]
swrast: Implement ARB_fragment_coord_conventions but don't enable.

This brings swrast's support up to the state of gallium, and fixes the
default center behavior of fragment.position.xy in piglit
fp-arb-fragment-coord-conventions-none.

The extension is not enabled currently because the GLSL part of the
extension isn't supported, so piglit
glsl-arb-fragment-coord-conventions-define fails as would any serious
test of the GLSL part.

14 years agosupport an 'embedded' platform target which turns off most parts of the
Alan Hourihane [Tue, 26 Jan 2010 20:58:11 +0000 (20:58 +0000)]
support an 'embedded' platform target which turns off most parts of the
build.

14 years agoCheck for __USE_MISC for defining uint & ushort
Alan Hourihane [Tue, 26 Jan 2010 20:57:03 +0000 (20:57 +0000)]
Check for __USE_MISC for defining uint & ushort

14 years agoMerge branch 'mesa_7_7_branch'
Brian Paul [Tue, 26 Jan 2010 20:23:25 +0000 (13:23 -0700)]
Merge branch 'mesa_7_7_branch'

Merging was easier than cherry picking in this instance.

14 years agomesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit support
Erik Wien [Tue, 26 Jan 2010 20:19:30 +0000 (13:19 -0700)]
mesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit support

If GL_EXT_framebuffer_blit was not supported _mesa_DeleteFramebuffersEXT
would raise an error when deleting the currently bound framebuffer. This
because it tried to bind the default DRAW- and READ_FRAMEBUFFER separately.
This patch binds the default FRAMEBUFFER instead in that case.

Encountered in the fbo/fbo-copyteximage piglit test on R600.

Patch cleaned up a bit by Brian Paul.

14 years agointel: make sure we update the renderbuffers after a swap
Jesse Barnes [Tue, 26 Jan 2010 20:16:53 +0000 (22:16 +0200)]
intel: make sure we update the renderbuffers after a swap

Now that LOCK_HARDWARE is gone, we don't have a convenient place to
update the renderbuffers everywhere we need them.  So grab new buffers
when we invalidate the old ones until we optimize things further.

14 years agoadd missing SCons.Util
Alan Hourihane [Tue, 26 Jan 2010 19:57:34 +0000 (19:57 +0000)]
add missing SCons.Util

14 years agovbo: if 'end' is out of bounds, clamp it
Brian Paul [Tue, 26 Jan 2010 19:49:44 +0000 (12:49 -0700)]
vbo: if 'end' is out of bounds, clamp it

If we determine that the 'end' parameter to glDrawElements() is out of
bounds, clamp it to the max legal index value.

14 years agovbo: clamp DrawElements start/end to max possible values
Brian Paul [Tue, 26 Jan 2010 19:47:51 +0000 (12:47 -0700)]
vbo: clamp DrawElements start/end to max possible values

Some apps are sloppy with their start/end values.  Clamp them to
max possible values to prevent problems later.

14 years agofix typo
Alan Hourihane [Tue, 26 Jan 2010 19:18:32 +0000 (19:18 +0000)]
fix typo

14 years agoAllow the environment to override certain flags.
Alan Hourihane [Tue, 26 Jan 2010 19:14:16 +0000 (19:14 +0000)]
Allow the environment to override certain flags.

14 years agoonly use -Werror flags with gcc 4.2.x and 4.3.x.
Alan Hourihane [Tue, 26 Jan 2010 19:13:27 +0000 (19:13 +0000)]
only use -Werror flags with gcc 4.2.x and 4.3.x.
could use a better test here though.

14 years agoglxgears: Support GLX_EXT_swap_control for querying the current swap interval.
Aaron Plattner [Tue, 26 Jan 2010 18:14:11 +0000 (10:14 -0800)]
glxgears: Support GLX_EXT_swap_control for querying the current swap interval.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agomesa: remove redundant _MaxElement computation
Brian Paul [Tue, 26 Jan 2010 17:53:34 +0000 (10:53 -0700)]
mesa: remove redundant _MaxElement computation

Eric added some new code to check if offset < obj_size before computing
_MaxElement but my original code was still present afterward and it
clobbered the _MaxElement value.

Not sure if this came from a bad merge or what.

14 years agoprogs/tests: use glDrawRangeElements() in bufferobj.c
Brian Paul [Tue, 26 Jan 2010 17:48:00 +0000 (10:48 -0700)]
progs/tests: use glDrawRangeElements() in bufferobj.c

14 years agodocs: document Intel, R300 env vars
Brian Paul [Tue, 26 Jan 2010 16:12:32 +0000 (09:12 -0700)]
docs: document Intel, R300 env vars

14 years agoegl: Remove _eglOpenDriver and _eglCloseDriver.
Chia-I Wu [Tue, 26 Jan 2010 10:41:15 +0000 (18:41 +0800)]
egl: Remove _eglOpenDriver and _eglCloseDriver.

_eglCloseDriver is no-op and _eglOpenDriver does nothing but call
_eglMatchDriver.  Export _eglMatchDriver directly.

14 years agoegl: Fix a segfault when a display is initialized again.
Chia-I Wu [Tue, 26 Jan 2010 10:34:29 +0000 (18:34 +0800)]
egl: Fix a segfault when a display is initialized again.

Reset dpy->MaxConfigs so that dpy->Configs is re-allocated.

14 years agoegl: Remove _eglGetCurrentSurface and _eglGetCurrentDisplay.
Chia-I Wu [Tue, 26 Jan 2010 09:13:51 +0000 (17:13 +0800)]
egl: Remove _eglGetCurrentSurface and _eglGetCurrentDisplay.

They have little use in drivers since drivers need to work for multiple
current contexts.

14 years agoegl: Fix leaks in eglReleaseThread.
Chia-I Wu [Tue, 26 Jan 2010 09:22:21 +0000 (17:22 +0800)]
egl: Fix leaks in eglReleaseThread.

There may be multiple bound contexts that should be unbound.

14 years agoegl: Refactor _eglMakeCurrent.
Chia-I Wu [Tue, 26 Jan 2010 08:53:40 +0000 (16:53 +0800)]
egl: Refactor _eglMakeCurrent.

Refactor _eglMakeCurrent into _eglCheckMakeCurrent,
_eglBindContextToSurface, and _eglBindContextToThread.

14 years agoegl: Add _eglGetAPIContext.
Chia-I Wu [Tue, 26 Jan 2010 08:52:14 +0000 (16:52 +0800)]
egl: Add _eglGetAPIContext.

It will return the currently bound context of the given API.

14 years agoegl: Use a boolean to indicate whether a resource is linked.
Chia-I Wu [Tue, 26 Jan 2010 07:16:49 +0000 (15:16 +0800)]
egl: Use a boolean to indicate whether a resource is linked.

An unlinked resource may still be a current resource such as current
surfaces.  There might still be a need to know which display the
unlinked resource belongs to.

14 years agoegl: Mark _eglCheckResource as PUBLIC.
Chia-I Wu [Tue, 26 Jan 2010 07:10:18 +0000 (15:10 +0800)]
egl: Mark _eglCheckResource as PUBLIC.

To support extensions such as GL_OES_EGL_image, the drivers need a way
to check if a given EGLImageKHR is valid.

14 years agoglsl/pp: Silence GCC "no previous prototype" warning.
Vinson Lee [Tue, 26 Jan 2010 08:45:54 +0000 (00:45 -0800)]
glsl/pp: Silence GCC "no previous prototype" warning.

14 years agointel: Don't do client-side frame throttling with DRI2 SwapBuffers.
Eric Anholt [Mon, 25 Jan 2010 22:53:50 +0000 (14:53 -0800)]
intel: Don't do client-side frame throttling with DRI2 SwapBuffers.

The server side does the throttling on our behalf now by putting the
client to sleep, so we don't need our previous hacks for limiting the
number of outstanding frames.  Same effect as
7d4e674b212c9dc6408c13913a399bd4a2b9a1e3.

14 years agoRevert "intel: Use the new DRI2 flush invalidate entrypoint to signal frame done."
Eric Anholt [Mon, 25 Jan 2010 22:48:57 +0000 (14:48 -0800)]
Revert "intel: Use the new DRI2 flush invalidate entrypoint to signal frame done."

This reverts commit 7d4e674b212c9dc6408c13913a399bd4a2b9a1e3.  It broke
throttling in the non-new-DRI2 case.

14 years agoi965: Remove unnecessary malloc/free in VS binding table setup.
Eric Anholt [Tue, 19 Jan 2010 23:26:56 +0000 (15:26 -0800)]
i965: Remove unnecessary malloc/free in VS binding table setup.

14 years agoi965: Fix build after merge of mesa stable branch.
Eric Anholt [Tue, 26 Jan 2010 06:27:46 +0000 (22:27 -0800)]
i965: Fix build after merge of mesa stable branch.

14 years agodocs: Mention EGL and OpenGL ES in 7.8 release notes.
Chia-I Wu [Tue, 26 Jan 2010 03:35:30 +0000 (11:35 +0800)]
docs: Mention EGL and OpenGL ES in 7.8 release notes.

14 years agoglx: Build GLX normally.
Chia-I Wu [Thu, 21 Jan 2010 09:58:28 +0000 (17:58 +0800)]
glx: Build GLX normally.

GLX was built specially and before Mesa core because libglapi.a could
not be built with IN_DRI_DRIVER defined.  This is no longer the case
since 6e99e6ddbf488f6955e34ef0bc438fdcb4d90f74.

It works fine in my (limited) testing with both direct and indirect
rendering.  I also compare the outputs after preprocessing (gcc -E) with
or without this commit, and they are identical.

14 years agodocs: Update EGL documentation.
Chia-I Wu [Tue, 26 Jan 2010 02:54:45 +0000 (10:54 +0800)]
docs: Update EGL documentation.

Add --enable-gallium-swrast to the example.  Document missing
--with-egl-driver-dir and update TODOs.

14 years agoegl/xdri: Update with glxclient.h change.
Chia-I Wu [Tue, 26 Jan 2010 02:46:32 +0000 (10:46 +0800)]
egl/xdri: Update with glxclient.h change.

__glXFindDisplay is no longer static since
7a9329ba99fe1242c07fbf4fd04e7a4dbeba2e72.

14 years agomesa: misc GLX_INTEL_swap_event fixes
Robert Bragg [Wed, 20 Jan 2010 03:01:14 +0000 (03:01 +0000)]
mesa: misc GLX_INTEL_swap_event fixes

Fixup a few issues found through testing:
  - update GLX names to match glproto
  - register DRI2WireToEvent so it actually gets called

Signed-off-by: Robert Bragg <robert@linux.intel.com>
14 years agoMerge branch 'mesa_7_7_branch'
Brian Paul [Mon, 25 Jan 2010 21:46:17 +0000 (14:46 -0700)]
Merge branch 'mesa_7_7_branch'

Conflicts:

src/mesa/drivers/dri/intel/intel_screen.c
src/mesa/drivers/dri/intel/intel_swapbuffers.c
src/mesa/drivers/dri/r300/r300_emit.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texstate.c

14 years agor300: rv350+ support FLT16_2/4 vertex formats
Alex Deucher [Mon, 25 Jan 2010 21:19:19 +0000 (16:19 -0500)]
r300: rv350+ support FLT16_2/4 vertex formats

14 years agor300g: Finish and enable immediate mode.
Corbin Simpson [Mon, 25 Jan 2010 19:27:50 +0000 (11:27 -0800)]
r300g: Finish and enable immediate mode.

Based on Marek's immd-mode patch.

14 years agoradeong: Make sure that we're not emitting relocations for local buffers.
Corbin Simpson [Mon, 25 Jan 2010 19:04:55 +0000 (11:04 -0800)]
radeong: Make sure that we're not emitting relocations for local buffers.

Split from Marek's immd-mode patch.

14 years agoradeong: Make is_r3xx inline to avoid warnings.
Corbin Simpson [Mon, 25 Jan 2010 19:04:15 +0000 (11:04 -0800)]
radeong: Make is_r3xx inline to avoid warnings.

Split from Marek's immd-mode patch.

14 years agoradeong: Clean up domain usages.
Corbin Simpson [Mon, 25 Jan 2010 19:01:16 +0000 (11:01 -0800)]
radeong: Clean up domain usages.

Split from Marek's immd-mode patch.

14 years agoRevert "r300g,radeong: finish and enable the immediate mode"
Corbin Simpson [Mon, 25 Jan 2010 18:52:19 +0000 (10:52 -0800)]
Revert "r300g,radeong: finish and enable the immediate mode"

This reverts commit 112239e9a66a155d36fe2ad0ab130e6f26eff298.

14 years agost/xorg: Fix crash on resize with libkms
Jakob Bornecrantz [Mon, 25 Jan 2010 19:07:43 +0000 (20:07 +0100)]
st/xorg: Fix crash on resize with libkms

14 years agovega: fix incorrect samplers, textures indexes in blend_bind_samplers()
Igor Oliveira [Mon, 25 Jan 2010 16:53:53 +0000 (09:53 -0700)]
vega: fix incorrect samplers, textures indexes in blend_bind_samplers()

Fixes fd.o bug 25863.

Signed-off-by: Brian Paul <brianp@vmware.com>
14 years agoFix compressed texture loads for non-minimal pitches again
Luca Barbieri [Wed, 20 Jan 2010 01:39:27 +0000 (17:39 -0800)]
Fix compressed texture loads for non-minimal pitches again

My commit eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 does a memcpy of height
lines, but that's wrong because the texture has a block layout and we
must thus use the number of vertical blocks instead of the height.

Signed-off-by: Brian Paul <brianp@vmware.com>