summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/osmesa
AgeCommit message (Collapse)AuthorFilesLines
2013-11-15osmesa: fix broken triangle/line drawing when using float color bufferBrian Paul1-0/+16
Doesn't seem to help with bug 71363 but it fixed a failure I found in my testing. Cc: "9.2" <mesa-stable@lists.freedesktop.org> Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit a66a008b17872f3eab91b7d04dd70e4537bdb627)
2013-08-21osmesa: Symlink shared library to LIB_DIRArmin K1-0/+1
Cc: 9.2 <mesa-stable@lists.freedesktop.org> Tested-by: Brian Paul <brianp at vmware.com> Reviewed-by: Brian Paul <brianp at vmware.com>
2013-07-16osmesa: link against static libglapi library too to get the gl exportsMaarten Lankhorst1-3/+3
This should fix missing symbols in a osmesa built against shared glapi osmesa build. All opengl exports were missing that are defined in the static glapi, so link against both to fix this. This is a candidate for the stable series. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47824 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
2013-06-28osmesa: Don't call _mesa_enable_._._extensions and _mesa_enable_sw_extensionsIan Romanick1-5/+0
_mesa_enable_sw_extensions enables all the extensions (and more) that the others enable. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-06-25mesa: Remove the Initialized field from framebuffers.Eric Anholt1-1/+0
This existed to tell the core not to call GetBufferSize, except that even if you didn't set it nothing happened because nobody had a GetBufferSize. v2: Remove two more instances of setting the field (from Brian) Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-25mesa: Remove Driver.GetBufferSize and its callers.Eric Anholt1-1/+0
Only the GDI driver set it to non-NULL any more, and that driver has a Viewport hook that should keep it limping along as well as it ever has. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-05mesa: remove outdated version lines in commentsRico Schüller1-1/+0
Signed-off-by: Brian Paul <brianp@vmware.com>
2013-05-01build: remove unused API_DEFINESAndreas Boll1-2/+1
Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-04-23mesa: Restore 78-column wrapping of license text in C-style comments.Kenneth Graunke1-3/+4
The previous commit introduced extra words, breaking the formatting. This text transformation was done automatically via the following shell command: $ git grep 'THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY' | sed 's/:.*$//' | xargs -I {} sh -c 'vim -e -s {} < vimscript where 'vimscript' is a file containing: /THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY/;/\*\// !fmt -w 78 -p ' * ' :wq Reviewed-by: Brian Paul <brianp@vmware.com>
2013-04-23mesa: Add "OR COPYRIGHT HOLDERS" to license text disclaiming liability.Kenneth Graunke1-1/+1
This brings the license text in line with the MIT License as published on the Open Source Initiative website: http://opensource.org/licenses/mit-license.php Generated automatically be the following shell command: $ git grep 'THE AUTHORS BE LIABLE' | sed 's/:.*$//g' | xargs -I '{}' \ sed -i 's/THE AUTHORS/THE AUTHORS OR COPYRIGHT HOLDERS/' {} This introduces some wrapping issues, to be fixed in the next commit. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-04-23mesa: Change "BRIAN PAUL" to "THE AUTHORS" in license text.Kenneth Graunke1-1/+1
Generated automatically be the following shell command: $ git grep 'BRIAN PAUL BE LIABLE' | sed 's/:.*$//g' | xargs -I '{}' \ sed -i 's/BRIAN PAUL/THE AUTHORS/' {} The intention here is to protect all authors, not just Brian Paul. I believe that was already the sensible interpretation, but spelling it out is probably better. More practically, it also prevents people from accidentally copy & pasting the license into a new file which says Brian is not liable when he isn't even one of the authors. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-03-19osmesa: fix out-of-tree buildAndreas Boll1-0/+1
Taken from downstream: http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=blob;f=debian/patches/14-fix-osmesa-build.diff;h=00581d0e1833c5492d9050e1bf3d5e658cad782e;hb=refs/heads/ubuntu%2B1 v2: Move the added line immediately after -I$(top_srcdir)/src/mapi NOTE: This is a candidate for the 9.1 and 9.0 branches. Acked-by: Kenneth Graunke <kenneth@whitecape.org> (v1) Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-01-29osmesa: use _mesa_generate_mipmap() for mipmap generation, not metaBrian Paul1-0/+3
See previous commit for more info. Note: This is a candidate for the 9.0 branch. Reviewed-by: José Fonseca <jfonseca@vmware.com>
2013-01-21mesa: Make the drivers call a non-code-generated dispatch table setup.Eric Anholt1-1/+1
I want to drive the Save dispatch table setup from this same function. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-01-21scons: Fix dependencies of generated headers.José Fonseca1-2/+1
It appears that scons implicit dependency scanners fail to chain dependencies of generated headers when these are outside the build tree. This patch ensures generated source files are _always_ put in the build tree. I'm not 100% this will fix all depency issues, but from my experiments it does seem to fix this. NOTE: For this to be effective it is necessary to clean the source tree from generated header/source files. Reviewed-by: Brian Paul <brianp@vmware.com>
2013-01-10Clean up .gitignore filesMatt Turner1-1/+0
2012-12-17mesa osmesa/x11: fix build error introduced in 4bea4cb9Jordan Justen1-5/+5
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/+9
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-2/+2
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-16Remove OpenVMS supportMatt Turner1-45/+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-05mesa: remove the driverCtx parameter to _mesa_create/initialize_context()Brian Paul1-1/+1
No longer used.
2012-10-01build: Add visibility CFLAGS to OSMesaMatt Turner1-2/+4
2012-10-01build: Link OSMesa with glapi, libdl, libstdc++Matt Turner1-5/+12
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813 https://bugs.freedesktop.org/show_bug.cgi?id=53179
2012-09-07Set OSMESA_VERSION=8.Johannes Obermayr2-3/+3
VERSION_NUMBER is not required anymore. So it will be removed. Reviewed-by: Adam Jackson <ajax@redhat.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-24build: Add libOSMesa.so.$(VERSION) link to libdirMatt Turner1-0/+1
2012-08-24build: Replace OSMESA_VERSION with generic VERSION_NUMBERMatt Turner1-1/+1
Can be used by other modules.
2012-08-16build: Remove -shared from OSMesa's LDFLAGSMatt Turner1-1/+1
Would break the static build.
2012-07-31Move installing osmesa.pc to drivers/osmesaJon TURNEY2-2/+15
Move installing osmesa.pc to drivers/osmesa, where it belongs better This also restores the installation of gl.pc if we are building osmesa at the same time as libGL, which was broken in commit 39785488 when the .pc installation was converted to automake v2: Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we will only be building in the drivers/osmesa directory if the condition it checked was true. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net>
2012-07-25drivers/osmesa: Link OSMesa using -no-undefined libtool flagJon TURNEY1-1/+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-13Don't explicitly link libOsmesa with libmesa's dependency libglslJon TURNEY1-2/+1
The libmesa convenience library is linked with the libglsl convenience library. libOsmesa is linked with libmesa, and also directly with libglsl. When using libtool, this gives rise to duplicate symbol errors. 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 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-07-13automake: convert libglslJon TURNEY1-1/+1
v2: Use AM_V_GEN to silence generated code rules. Add BUILT_SOURCES to CLEANFILES v3: - Fix an accidental // in a path - Use automake make rules for lex/yacc rather than writing our own - Update .gitignore appropriately - Build a libglcpp convenience library rather than awkwardly including the files in libglsl and delegating the generation - Remove libglsl.a compatibility link on clean v4: - Automake's rules for lex/yacc make .cc if source is .ll or .yy, and apparently we must use those extensions "because of scons", so update everywhere glsl_parser.cpp -> glsl_parser.cc and glsl_lexer.cpp -> glsl_lexer.cc. This fixes 'make tarballs' and building with dricore enabled. 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 libOSmesaLaurent Carlier3-51/+51
This also currently fix the installation of libOSmesa. v2: Remove old Makefile, libOSmesa is now versioned, fix typos v3: Keep config substitution alphabetized v4: Update .gitignore v5: Libraries will be in the builddir, not the srcdir. Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
2012-05-31scons: add code to generate the various GL API filesBrian Paul1-0/+2
This fixes recent build breakage when we began building the generated API files from xml as part of the normal build process. Fixes http://bugs.freedesktop.org/show_bug.cgi?id=50475
2012-02-24osmesa: use SWRAST_MAX_WIDTH/HEIGHTBrian Paul1-4/+4
2012-02-02Revert "Fix underlinking in libOSMesa since commit adefee5 "Always build ↵Brian Paul1-2/+0
shared glapi"" This reverts commit 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2. ... to fix build with --enable-osmesa
2012-01-31Revert "automake: src/mesa/drivers/osmesa"Matt Turner4-101/+53
This reverts commit 275ac7e5c1fd6c1847a428192fe259e50690fced.
2012-01-31Revert "automake: src/glsl and src/glsl/glcpp"Matt Turner1-1/+1
This reverts commit 9947656168d09f9019600fccc42ca8e0de49b83a.
2012-01-31osmesa: set RefCount = 1 in new_osmesa_renderbuffer()Brian Paul1-0/+1
This was lost during the renderbuffer overhaul work. Fixes a failed refcount assertion.
2012-01-31osmesa: Fix osmesa_context.DataType type.Vinson Lee1-1/+1
Fixes these GCC warnings. osmesa.c: In function ‘osmesa_renderbuffer_storage’: osmesa.c:417: warning: comparison is always false due to limited range of data type osmesa.c:423: warning: comparison is always false due to limited range of data type osmesa.c:431: warning: comparison is always false due to limited range of data type osmesa.c:437: warning: comparison is always false due to limited range of data type osmesa.c:447: warning: comparison is always false due to limited range of data type osmesa.c:453: warning: comparison is always false due to limited range of data type osmesa.c:463: warning: comparison is always false due to limited range of data type osmesa.c:466: warning: comparison is always false due to limited range of data type osmesa.c:476: warning: comparison is always false due to limited range of data type osmesa.c:479: warning: comparison is always false due to limited range of data type Signed-off-by: Vinson Lee <vlee@freedesktop.org> Signed-off-by: Brian Paul <brianp@vmware.com>
2012-01-30automake: src/glsl and src/glsl/glcppMatt Turner1-1/+1
Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Eric Anholt <eric@anholt.net> Signed-off-by: Matt Turner <mattst88@gmail.com>
2012-01-30automake: src/mesa/drivers/osmesaMatt Turner4-53/+101
2012-01-24osmesa: use swrast_renderbufferBrian Paul1-42/+45
2012-01-24mesa: rename gl_renderbuffer::Data to BufferBrian Paul1-7/+7
To better indicate that this pointer to the malloc'd memory.
2012-01-24mesa: remove gl_renderbuffer::DataTypeBrian Paul1-19/+15
2012-01-24osmesa: remove obsolete GetRow/PutRow codeBrian Paul1-430/+1
2012-01-23Fix underlinking in libOSMesa since commit adefee5 "Always build shared glapi"Jon TURNEY1-0/+2
Since we now always build shared glapi, this exposes the fact that libOSMesa was underlinked when glapi was built shared. Fix this by doing the same thing as drivers/X11/Makefile already does, ensuring that the library is linked with the shared glapi library. (I'm not clear why we link with both glapi.a and glapi.so, so this may be all wrong) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>