summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
AgeCommit message (Collapse)AuthorFilesLines
2013-01-10Clean up .gitignore filesMatt Turner1-1/+0
2013-01-04xlib: allow GLX_DONT_CARE for glXChooseFBConfig() attribute valuesBrian Paul1-0/+14
Fixes piglit glx-dont-care-mask test. Note: This is a candidate for the stable branches. Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
2012-12-31xlib: handle _mesa_initialize_visual()'s return valueBrian Paul1-9/+12
If the call fails, we should return NULL from XMesaCreateVisual(). This was found when Waffle tried to create a visual with depth/stencil bits = -1. That's an illegal value for glXChooseFBConfig() and we should return NULL in that situation. Note: This is a candidate for the stable branches.
2012-12-17xlib: include headers to fix errors/warningsBrian Paul1-0/+2
2012-12-17mesa osmesa/x11: fix build error introduced in 4bea4cb9Jordan Justen1-3/+3
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=58380 Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2012-12-16drivers: compute version and then initialize exec tableJordan Justen1-0/+7
This change forces the context version to be computed before initilizing the exec dispatch tables. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-11-30mesa: pass context parameter to gl_renderbuffer::Delete()Brian Paul1-1/+1
We sometimes need a rendering context when deleting renderbuffers. Pass it explicitly instead of trying to grab a current context (which might be NULL). The next patch will make use of this. Note: this is a candidate for the stable branches. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
2012-11-29mesa: Rename API_OPENGL to API_OPENGL_COMPAT.Paul Berry1-1/+1
This should help avoid confusion now that we're using the gl_api enum to distinguishing between core and compatibility API's. The corresponding enum value for core API's is API_OPENGL_CORE. Acked-by: Eric Anholt <eric@anholt.net> Acked-by: Matt Turner <mattst88@gmail.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org>
2012-11-21scons: Append x11 library path if linking x11 library.Vinson Lee1-0/+1
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2012-11-16Remove OpenVMS supportMatt Turner7-78/+0
Not maintained since 2008. Doubtful that it's worked in quite a while. Also see commit 32ac8cb05 which removed VMS stuff from Makefile in 2009. Cc: Jouk Jansen <j.jansen@tudelft.nl> Reviewed-by: Brian Paul <brianp@vmware.com> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
2012-10-29xlib: Do not undefine _R, _G, and _B.Vinson Lee1-3/+0
Fixes build error on Cygwin and Solaris. _R, _G, and _B are used in ctype.h on those platforms. Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
2012-10-26scons: Build xlib swrast too.José Fonseca1-0/+48
Helpful for debugging.
2012-10-05mesa: remove the driverCtx parameter to _mesa_create/initialize_context()Brian Paul1-1/+1
No longer used.
2012-09-05Remove useless checks for NULL before freeingMatt Turner1-3/+1
This patch has been generated by the following Coccinelle semantic patch: // Remove useless checks for NULL before freeing // // free (NULL) is a no-op, so there is no need to avoid it @@ expression E; @@ + free (E); + E = NULL; - if (unlikely (E != NULL)) { - free(E); ( - E = NULL; | - E = 0; ) ... - } @@ expression E; type T; @@ + free ((T) E); + E = NULL; - if (unlikely (E != NULL)) { - free((T) E); ( - E = NULL; | - E = 0; ) ... - } @@ expression E; @@ + free (E); - if (unlikely (E != NULL)) { - free (E); - } @@ expression E; type T; @@ + free ((T) E); - if (unlikely (E != NULL)) { - free ((T) E); - } Reviewed-by: Brian Paul <brianp@vmware.com>
2012-09-05Don't cast the return value of malloc/reallocMatt Turner5-9/+9
This patch has been generated by the following Coccinelle semantic patch: // Don't cast the return value of malloc/realloc. // // Casting the return value of malloc/realloc only stands to hide // errors. @@ type T; expression E1, E2; @@ - (T) ( _mesa_align_calloc(E1, E2) | _mesa_align_malloc(E1, E2) | calloc(E1, E2) | malloc(E1) | realloc(E1, E2) )
2012-09-05Remove Xcalloc/Xmalloc/Xfree callsMatt Turner1-9/+9
These calls allowed Xlib to use a custom memory allocator, but Xlib has used the standard C library functions since at least its initial import into git in 2003. It seems unlikely that it will grow a custom memory allocator. The functions now just add extra overhead. Replacing them will make future Coccinelle patches simpler. This patch has been generated by the following Coccinelle semantic patch: // Remove Xcalloc/Xmalloc/Xfree calls @@ expression E1, E2; @@ - Xcalloc (E1, E2) + calloc (E1, E2) @@ expression E; @@ - Xmalloc (E) + malloc (E) @@ expression E; @@ - Xfree (E) + free (E) @@ expression E; @@ - XFree (E) + free (E) Reviewed-by: Brian Paul <brianp@vmware.com>
2012-09-01mesa: s/FREE/free/Brian Paul1-1/+1
v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-09-01mesa: s/MALLOC/malloc/Brian Paul3-4/+4
v2: replace instances in dri/common/ dirs Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-08-24xlib: remove texture compression hackeryBrian Paul3-29/+0
I think this was left-over debug code from long ago. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-08-24build: Only add links to .so files if we're building themMatt Turner1-0/+2
Xlib-GLX and OSMesa support static building. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=53962
2012-08-22build/x11: Force usage of C++ linkerMatt Turner1-0/+3
Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-08-22build/x11: Don't link against shared-glapiMatt Turner1-4/+0
Tested-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2012-07-26xlib: add X error handler around XGetImage() callBrian Paul1-0/+29
XGetImage() will generate a BadMatch error if the source window isn't visible. When that happens, create a new XImage. Fixes piglit 'select' test failures with swrast/xlib driver. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2012-07-25Update mesa/drivers/x11/Makefile.am for xm_image.h removalJon TURNEY1-1/+0
Commit 6c6803f28de0d4cb6937fcd95a47aa81da31fd78 removed xm_image.[ch], and removed xm_image.c, but not xm_image.h from the Makefile, this was subsequently carried over into Makefile.am Remove xm_image.h from Makfile.am. This allows 'make dist' to succeed, even if it doesn't do anything useful Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2012-07-25drivers/X11: Link X11 libGL with -no-undefined libtool flagJon TURNEY1-0/+1
"Use -no-undefined to assure libtool that the library has no unresolved symbols at link time, so that libtool will build a shared library on platforms require that all symbols are resolved when the library is linked." Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2012-07-23automake: Honor GL_LIB for mangled/custom lib namesBrad King1-8/+8
Commit 2d4b77c7 (automake: Convert src/mesa/drivers/x11/Makefile to automake, 2012-06-12) dropped the old Makefile, which used GL_LIB, and replaced it with a Makefile.am hard-coding the name "GL". This broke handling of --enable-mangling and --with-gl-lib-name options which depend on GL_LIB to specify the GL library name. Use "@GL_LIB@" in src/mesa/drivers/x11/Makefile.am to configure the library name. Also use this approach to simplify src/glx/Makefile.am and drop the HAVE_MANGLED_GL conditional. While at it, fix the compatibility link we create in "lib" for the software-only driver to use version GL_MAJOR instead of hard-coding "1". Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2012-07-13automake: convert libglapiJon TURNEY1-1/+1
* "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-07-13automake: convert libmesa and libmesagalliumJon TURNEY1-1/+1
* "configure substitutions are not allowed in _SOURCES variables" in automake, so instead of MESA_ASM_FILES, use some AM_CONDITIONALS to choose which architecture's asm sources are used in libmesa_la_SOURCES. (Can't remove MESA_ASM_FILES autoconf variable as it's still used in sources.mak) * Update to link with the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: Remove stray -static from LDFLAGS v3: Remove .a compatibility link on clean Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-06-21automake: Convert src/mesa/drivers/x11/Makefile to automake.Eric Anholt3-81/+75
The weird versioning of the libGL where the package version was sort of expressed as a big integer is dropped. libtool didn't like the 0 prefix, and it didn't really make sense anyway -- if you interpret it as an integer version number, old Mesa 071200 was bigger than current Mesa 08100. Instead, just bump the minor version and drop the patchlevel.
2012-05-01xlib: use _mesa_is_winsys/user_fbo() helpersBrian Paul1-5/+6
Reviewed-by: Eric Anholt <eric@anholt.net>
2012-03-12xlib: remove clear_color() functionBrian Paul1-25/+11
Just setup the clearing color in clear_buffers(). Reviewed-by: Dave Airlie <airlied@redhat.com>
2012-02-27xlib: silence unused var warningBrian Paul1-0/+1
2012-02-24xlib: remove STENCIL_BITSBrian Paul1-3/+3
2012-02-24xlib: use SWRAST_MAX_WIDTH/HEIGHTBrian Paul1-3/+3
2012-01-24xlib: derive xmesa_renderbuffer from swrast_renderbufferBrian Paul4-24/+27
2012-01-24xlib: remove xm_span.c and related codeBrian Paul6-249/+1
2012-01-24mesa: remove gl_renderbuffer::WrappedBrian Paul3-12/+12
There's no such thing as renderbuffer wrappers anymore.
2012-01-24mesa: rename gl_renderbuffer::Data to BufferBrian Paul1-2/+2
To better indicate that this pointer to the malloc'd memory.
2012-01-24mesa: remove gl_renderbuffer::DataTypeBrian Paul1-1/+0
2012-01-24xlib: remove obsolete GetRow/PutRow codeBrian Paul1-1594/+3
2012-01-24Revert "Always build shared glapi"Matt Turner1-0/+2
This reverts commit adefee50d954151f76150af80207081ae3c247d9. Shared glapi was never tested with --enable-xlib-glx and turns out to cause a lot of problems. Conflicts: configure.ac
2012-01-20Always build shared glapiMatt Turner1-2/+0
libglapi.so, libGL.so, libGLESv2.so, libGLESv1_CM.so must all come from the same version of Mesa or bad things may happen. Acked-by: Kenneth Graunke <kenneth@whitecape.org> Signed-off-by: Matt Turner <mattst88@gmail.com>
2012-01-11xlib: stop calling XShmQueryVersion()Brian Paul1-8/+8
It caused an X protocol error in some (rare) situations. This is a follow-on to the previous commits which fixes a bug reported by Wayne E. Robertz. NOTE: This is a candidate for the 7.11 branch. Reviewed-by: Adam Jackson <ajax@redhat.com>
2012-01-11xlib: call register_with_display() in Fake_glXChooseFBConfig()Brian Paul1-0/+3
as we do in Fake_glXChooseVisual(). This registers the MesaGLX extension on the display so we can clean up buffers, etc. when the display connection is closed. Fixes a bug reported by Wayne E. Robertz. NOTE: This is a candidate for the 7.11 branch. Reviewed-by: Adam Jackson <ajax@redhat.com>
2012-01-04Remove xmesa_xf86.hAdam Jackson1-197/+0
This was a leftover from libGLcore. Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-12-24mesa: remove gl_renderbuffer::PutRowRGB()Brian Paul1-601/+0
No longer used anywhere. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-12-24mesa: remove gl_renderbufer::PutMonoRow() and PutMonoValues()Brian Paul1-450/+1
The former was only used for clearing buffers. The later wasn't used anywhere! Remove them and all implementations of those functions. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-12-08mesa/drivers: use new swrast renderbuffer functionsBrian Paul2-10/+12
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: remove xm_image.[ch] filesBrian Paul3-117/+0
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: remove a ton of old xlib driver cruftBrian Paul9-3409/+4
The days of 1-bpp, 8-bpp and dithering are long behind us. Reviewed-by: Eric Anholt <eric@anholt.net>