Alan Hourihane
46f453b298
Check for __USE_MISC for defining uint & ushort
2010-01-26 20:59:11 +00:00
Brian Paul
43867acb6a
Merge branch 'mesa_7_7_branch'
...
Merging was easier than cherry picking in this instance.
2010-01-26 13:25:53 -07:00
Erik Wien
68ca19afd7
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.
2010-01-26 13:19:32 -07:00
Jesse Barnes
06d228d8b9
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.
2010-01-26 22:18:27 +02:00
Alan Hourihane
550fc19a5f
add missing SCons.Util
2010-01-26 19:57:34 +00:00
Brian Paul
cbecb8fc8e
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.
2010-01-26 12:49:48 -07:00
Brian Paul
645e297a00
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.
2010-01-26 12:47:54 -07:00
Alan Hourihane
18bb614acf
fix typo
2010-01-26 19:18:32 +00:00
Alan Hourihane
6544be6223
Allow the environment to override certain flags.
2010-01-26 19:14:50 +00:00
Alan Hourihane
1019f0de11
only use -Werror flags with gcc 4.2.x and 4.3.x.
...
could use a better test here though.
2010-01-26 19:14:49 +00:00
Aaron Plattner
cec0e7c086
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>
2010-01-26 12:00:51 -07:00
Brian Paul
af1e9403e7
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.
2010-01-26 10:53:40 -07:00
Brian Paul
782f66c8a2
progs/tests: use glDrawRangeElements() in bufferobj.c
2010-01-26 10:48:00 -07:00
Brian Paul
1d8b308cbf
docs: document Intel, R300 env vars
2010-01-26 09:12:32 -07:00
Chia-I Wu
092b1ca989
egl: Remove _eglOpenDriver and _eglCloseDriver.
...
_eglCloseDriver is no-op and _eglOpenDriver does nothing but call
_eglMatchDriver. Export _eglMatchDriver directly.
2010-01-26 18:46:06 +08:00
Chia-I Wu
545eaf83b5
egl: Fix a segfault when a display is initialized again.
...
Reset dpy->MaxConfigs so that dpy->Configs is re-allocated.
2010-01-26 18:46:05 +08:00
Chia-I Wu
a1717970e7
egl: Remove _eglGetCurrentSurface and _eglGetCurrentDisplay.
...
They have little use in drivers since drivers need to work for multiple
current contexts.
2010-01-26 18:46:05 +08:00
Chia-I Wu
11cf3cb2c4
egl: Fix leaks in eglReleaseThread.
...
There may be multiple bound contexts that should be unbound.
2010-01-26 18:46:05 +08:00
Chia-I Wu
7c09296d4c
egl: Refactor _eglMakeCurrent.
...
Refactor _eglMakeCurrent into _eglCheckMakeCurrent,
_eglBindContextToSurface, and _eglBindContextToThread.
2010-01-26 18:46:05 +08:00
Chia-I Wu
6f6f3e4227
egl: Add _eglGetAPIContext.
...
It will return the currently bound context of the given API.
2010-01-26 18:46:05 +08:00
Chia-I Wu
f65ed0a309
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.
2010-01-26 18:46:05 +08:00
Chia-I Wu
d21ee93fdb
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.
2010-01-26 18:46:05 +08:00
Vinson Lee
c73dbce891
glsl/pp: Silence GCC "no previous prototype" warning.
2010-01-26 00:47:31 -08:00
Eric Anholt
7aed23c362
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
7d4e674b21
.
2010-01-25 22:57:33 -08:00
Eric Anholt
c7fc9bfb22
Revert "intel: Use the new DRI2 flush invalidate entrypoint to signal frame done."
...
This reverts commit 7d4e674b21
. It broke
throttling in the non-new-DRI2 case.
2010-01-25 22:57:33 -08:00
Eric Anholt
5e1851b144
i965: Remove unnecessary malloc/free in VS binding table setup.
2010-01-25 22:57:30 -08:00
Eric Anholt
a098fd71d7
i965: Fix build after merge of mesa stable branch.
2010-01-25 22:27:46 -08:00
Chia-I Wu
74aa773f7c
docs: Mention EGL and OpenGL ES in 7.8 release notes.
2010-01-26 11:35:30 +08:00
Chia-I Wu
146931769c
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 6e99e6ddbf
.
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.
2010-01-26 11:03:54 +08:00
Chia-I Wu
a6342afe50
docs: Update EGL documentation.
...
Add --enable-gallium-swrast to the example. Document missing
--with-egl-driver-dir and update TODOs.
2010-01-26 10:55:28 +08:00
Chia-I Wu
0d2d40451d
egl/xdri: Update with glxclient.h change.
...
__glXFindDisplay is no longer static since
7a9329ba99
.
2010-01-26 10:48:16 +08:00
Robert Bragg
7a9329ba99
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>
2010-01-25 15:40:56 -08:00
Brian Paul
9b22427911
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
2010-01-25 14:46:17 -07:00
Alex Deucher
7e7f8815fb
r300: rv350+ support FLT16_2/4 vertex formats
2010-01-25 16:19:19 -05:00
Corbin Simpson
5fe71949d9
r300g: Finish and enable immediate mode.
...
Based on Marek's immd-mode patch.
2010-01-25 11:30:39 -08:00
Corbin Simpson
1571602153
radeong: Make sure that we're not emitting relocations for local buffers.
...
Split from Marek's immd-mode patch.
2010-01-25 11:30:39 -08:00
Corbin Simpson
c486bfb463
radeong: Make is_r3xx inline to avoid warnings.
...
Split from Marek's immd-mode patch.
2010-01-25 11:30:39 -08:00
Corbin Simpson
67149051be
radeong: Clean up domain usages.
...
Split from Marek's immd-mode patch.
2010-01-25 11:30:39 -08:00
Corbin Simpson
72778a9d25
Revert "r300g,radeong: finish and enable the immediate mode"
...
This reverts commit 112239e9a6
.
2010-01-25 11:30:38 -08:00
Jakob Bornecrantz
6749310d3f
st/xorg: Fix crash on resize with libkms
2010-01-25 20:12:59 +01:00
Igor Oliveira
0d051af612
vega: fix incorrect samplers, textures indexes in blend_bind_samplers()
...
Fixes fd.o bug 25863.
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-01-25 09:53:53 -07:00
Luca Barbieri
9328f3a670
Fix compressed texture loads for non-minimal pitches again
...
My commit eea6a7639f
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>
2010-01-25 08:11:49 -07:00
Chia-I Wu
2204447de3
winsys/drm: Correctly install EGL drivers.
...
Remove extraneous quotes that prevent some drivers to be installed when
there are more than one display in EGL_DISPLAYS.
2010-01-25 23:06:05 +08:00
José Fonseca
cb64ca5066
pipebuffer: Reapply the mesa_7_7_branch's changes.
...
After the last mesa_7_7_branch merge the old master code remained,
instead of the newer mesa_7_7_branch's code. This commit makes both
branches match, modulo interface changes.
Note: future mesa_7_7_branch -> master merges will most likely hit
conflicts in these files. Unless otherwise stated, the mesa_7_7_branch
is the reference.
2010-01-25 13:17:47 +00:00
José Fonseca
4c082faa7e
llvmpipe: Remove lp_tex_sample_c.c again.
...
Popped back to life in some merge. Not necessary even as a reference,
since it is identical to softpipe's sp_tex_sample.c with renamed symbols.
2010-01-25 11:54:54 +00:00
Jakob Bornecrantz
6877c5de3c
vmware/xorg: Do buffer round-robin logic differently
2010-01-25 12:27:47 +01:00
Jakob Bornecrantz
0b482c4fbe
st/xorg: Improve options and print them to log
...
Set 2D acceleration to off by default
Get fallback debugging from the Xorg config
Also print if 3D acceleration is enabled
2010-01-25 11:24:56 +01:00
Jakob Bornecrantz
a3b783ea29
vmware/xorg: Export pci_probe function for ugly chain-loading
2010-01-25 11:24:55 +01:00
Jakob Bornecrantz
36fd55f9f0
st/xorg: Export helper function for detecting modesetting
2010-01-25 11:24:55 +01:00
Jakob Bornecrantz
16cf7e14a6
st/xorg: Fix warning
2010-01-25 11:24:55 +01:00