summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2014-01-02Haiku: Add in public GL kit headersAlexander von Gluck IV4-0/+307
* These make up the base of what C++ GL Haiku applications use for 3D rendering. * Not placed in includes/GL to prevent Haiku headers from getting installed on non-Haiku systems. Acked-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 56d920a5c1b64868e77a97604c01d3a63916a6ca)
2014-01-02Revert "mesa: Remove GLXContextID typedef from glx.h."Kenneth Graunke1-0/+1
This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. According to belak51 on IRC, this commit broke Allegro, which would no longer compile. Applications apparently expect the GLXContextID typedef to exist in glx.h; removing it breaks them. A bit of searching around the internet revealed other complaints since upgrading to Mesa 10. Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
2014-01-02r600g: fix SUMO2 pci idAlex Deucher1-1/+1
0x9649 is sumo2, not sumo. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> CC: "9.2" "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit e2d53fac1c5b18f5c9e95d39d4e2be4703b0b363)
2013-11-15dri: Remove redundant createNewContext function from __DRIimageDriverExtensionKristian Høgsberg1-8/+4
createContextAttribs is a superset of what createNewContext provides. Also remove the function typedef, since createNewContext is deprecated and no longer used in multiple interfaces. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Eric Anholt <eric@anholt.net> Cc: "10.0" <mesa-stable@lists.freedesktop.org> (cherry picked from commit e0489531455623aa21aa565b2c890362d8437f23)
2013-11-07dri: add __DRIimageLoaderExtension and __DRIimageDriverExtensionKeith Packard1-0/+76
These provide an interface between the driver and the loader to allocate color buffers through the DRIimage extension interface rather than through a loader-specific extension (as is used by DRI2, for instance). The driver uses the loader 'getBuffers' interface to allocate color buffers. The loader uses the createNewScreen2, createNewDrawable, createNewContext, getAPIMask and createContextAttribs APIS (mostly shared with DRI2). This interface will work with the DRI3 loader, and should also work with GBM and other loaders so that drivers need not be customized for each new loader interface, as long as they provide this image interface. v2: Fix build of i915 and i965 together (by anholt) Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-11-07Define __DRI_IMAGE_FORMAT_SARGB8Keith Packard1-0/+1
This format will be used by the i965 driver Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-11-07drivers/dri/common: A few dri2 functions are not actually DRI2 specificKeith Packard1-22/+39
This just renames them so that they can be used with the DRI3 extension without causing too much confusion. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-11-07glx: Add GLX_MESA_query_rendererIan Romanick1-1/+26
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-07dri: Add interface definition for DRI_RENDERER_QUERY extensionIan Romanick1-0/+29
This will be used to let apps query hardware and driver limits before creating a GL context. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2013-11-05mesa: Remove last BEOS checksAlexander von Gluck IV1-8/+0
* Goodbye BeOS, we hardly knew thee * As BeOS was gcc2 only, there was little chance of this being useful. * Doesn't effect Haiku in any meaningful way Reviewed-by: Brian Paul <brianp@vmware.com>
2013-11-04mesa: remove OPENSTEP stuffBrian Paul1-5/+1
Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-11-04mesa: remove macintosh preprocessor stuffBrian Paul1-7/+0
IIRC, this is MacOS 9.x stuff. Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-11-04mesa: remove __QUICKDRAW__ testsBrian Paul2-6/+1
Reviewed-by: Matt Turner <mattst88@gmail.com>
2013-11-04mesa: remove Centerline C support from gl.hBrian Paul1-4/+0
Reviewed-by: Eric Anholt <eric@anholt.net>
2013-11-04mesa: remove SciTech stuff from gl.hBrian Paul1-5/+1
Reviewed-by: Eric Anholt <eric@anholt.net>
2013-10-24dri: Implement a DRI vtable extension to replace the global driDriverAPI.Eric Anholt1-0/+17
As we move to megadrivers, we are unable to build multiple drivers with the same public global symbol per driver (Think an X Server with an intel and a nouveau driver, and the X Server implementing indirect for both -- we have to actually talk to the right driver). By slipping the driDriverAPI vtable into the driver's extension list, we can replace the usage of the global symbol with usage of the loader-dlsym()ed driver information. v2: Pull in the hunk to avoid crashing on null driver_extensions. Thanks, Emil! Reviewed-by: Matt Turner <mattst88@gmail.com> (v1) Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-10-24dri: Pass in the dlsym()ed driver extension to screen creation.Eric Anholt1-2/+25
This will allow a megadrivers build to reference the actual driver being loaded from the shared dri_util screen creation code. v2: Fix indentation, fallback case in EGL (review by Emil). Reviewed-by: Matt Turner <mattst88@gmail.com> (v1) Reviewed-by: Chad Versace <chad.versace@linux.intel.com> (v1) Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-10-24glx: Add an optional function call for getting the DRI driver interface.Eric Anholt1-0/+13
The previous interface relied on a static struct, which meant that the driver didn't get a chance to edit the struct before the struct got used. For megadrivers, I want struct specific to the driver being loaded. v2: Fix the prototype in the docs (caught by Marek). Since the driver name was in the function, we didn't need to also pass it in. v3: Fix asprintf error checking (caught by Matt's gcc). Reviewed-by: Matt Turner <mattst88@gmail.com> (v1) Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-10-24dri: Allow config options to be passed to the loader through extensions.Eric Anholt1-6/+14
Turns out already we have this nice mechanism for providing optional things from the driver to the loader, and I was going to have to rename the public global symbol to avoid conflicts when doing megadrivers. While the former __driConfigOptions is technically loader interface, this is the only loader that made use of that symbol. Continue paying attention to it if we can't find the new option, to retain compatibility with old drivers. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-10-22mesa: fixes for MSVC 2013Scott Graham1-1/+2
Cc: "9.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-10-22mesa: remove GL_MESA_program_debug bits from gl.hBrian Paul1-21/+0
The code for this was removed from Mesa some time ago. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-22mesa: remove remnants of GL_MESA_shader_debugBrian Paul1-20/+0
This extension never saw any real use so remove it. v2: also update tests/num_strings.cpp for 'make check' Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-18mesa: Remove GLXContextID typedef from glx.h.Vinson Lee1-1/+0
Fixes this build error. CC clientattrib.lo In file included from ../../include/GL/glx.h:333, from glxclient.h:45, from clientattrib.c:32: ../../include/GL/glxext.h:275: error: redefinition of typedef ‘GLXContextID’ ../../include/GL/glx.h:171: note: previous declaration of ‘GLXContextID’ was here Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70591 Signed-off-by: Vinson Lee <vlee@freedesktop.org>
2013-10-17mesa: remove PFNGLBLENDCOLORPROC, PFNGLBLENDEQUATIONPROC typedefs in gl.hBrian Paul1-2/+0
Fixes error about duplicated typedefs (also in glext.h) reported on NetBSD 6.1 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70546 Tested-by: Vinson Lee <vlee@freedesktop.org>
2013-10-16mesa: update glxext.h to version 20131008Brian Paul1-800/+637
The diff is huge but the actual changes are few: * Whitespace changes * Items are reordered * extern qualifiers dropped
2013-10-16mesa: update glext.h to version 20131008Brian Paul1-502/+750
Only two notable changes in this revision: * GLvoid has been replaced by void. * Added the GL_NV_blend_equation_advanced extension.
2013-10-15dri: Add __DRIimage support for the ARGB2101010 formatKristian Høgsberg1-0/+2
We add support for the ARGB2101010 color format to the DRI image extension, which allows DRI loaders to create a __DRIimage with this color format. Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2013-10-13i965: Add the family name to the PCI ID table.Kenneth Graunke2-94/+94
I removed this a while ago, since we never used it, but I'm finally resurrecting the idea in the next commits. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-10-13i965: Remove #define name from PCI ID table.Kenneth Graunke2-94/+94
Nothing uses the #define name, and it's not terribly useful - the numerical ID serves the same purpose. The only thing we could really do with it is generate slightly prettier preprocessed code. But who looks at that? Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-09-16egl: add EGL_WAYLAND_Y_INVERTED_WL attributeStanislav Vorobiov1-0/+2
This enables querying of wl_buffer's orientation
2013-09-06radeonsi: add berlin pci idsAlex Deucher1-0/+22
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2013-09-06gallium, intel: Implements new __DRI_IMAGE_USE_LINEAR and PIPE_BIND_LINEAR ↵Axel Davy1-0/+1
flags to enforce no tiling. Signed-off-by: Axel Davy <axel.davy@ens.fr>
2013-08-07egl: Update to Wayland 1.2 server APIAnder Conselvan de Oliveira1-3/+3
Since Wayland 1.2, struct wl_buffer and a few functions are deprecated. References to wl_buffer are replaced with wl_resource and some getter functions and calls to deprecated functions are replaced with the proper new API. The latter changes are related to resource versioning. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
2013-08-02dri: propagate extra dma_buf import attributes to the driversTopi Pohjolainen1-1/+38
v2: do not break ABI, but instead introduce new entry point for dma buffers and bump up the dri-interface version to eight v3 (Chad): allow the hook to specify an error originating from the driver. For now only unsupported format is considered. I thought about rejecting the hints also as they are addressing only YUV sampling which is not supported at the moment but then thought against it as the spec is not saying one way or the other. v4 (Eric, Chad): restrict to rgb formatted only v5: rebased on top of i915/i965 split v6 (Chad): document using full extension name Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
2013-07-29gles3: Update gl3.h to 2013-02-12.Matt Turner1-4/+4
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-07-29gles2: Update gl2ext.h to revision 22161.Matt Turner1-114/+357
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-07-29gles2: Update gl2.h to revision 20555.Matt Turner1-3/+3
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-07-29gles: Update glext.h to revision 20798.Matt Turner1-3/+3
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
2013-07-18dri: Introduce new flags in __DRI_ATTRIB_RENDER_TYPETomasz Lis1-0/+2
Mark __DRI_ATTRIB_FLOAT_MODE as deprecated, and introduce new flags to __DRI_ATTRIB_RENDER_TYPE for float modes. Both signed float (fbconfig_float) and unsigned (packed_float) are introduced. The old attribute should be set for both float modes. v2 (idr): Require that the render mode from the DRI attributes matches the render mode of the config exactly. This is the behavior of the old code. Signed-off-by: Tomasz Lis <tomasz.lis@intel.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2013-07-12mesa: update glext.h to version 20130708Brian Paul1-14/+16
This update fixes the problem with duplicated typedefs for GLclampf and GLclampd in the previous version. It also changes some parameter types for glDebugMessageCallbackARB() and glTransformFeedbackVaryingsEXT(). Note we should someday update the glapi-gen code so that it understands void pointer parameters. Currently, the Python code only understands "GLvoid *" but not "void *". Luckily, the compilers don't seem to complain about mixing GLvoid and void.
2013-07-01eglplatform: use unsigned long instead of 32-bit ints in generic platformRoss Burton1-2/+2
In the generic Unix case use the "unsigned long" type instead of 32-bit integers so that the type sizes are consistant on 64-bit machines between X11 and not-X11. Signed-off-by: Ross Burton <ross.burton@intel.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
2013-06-28radeonsi: add kabini pci idsAlex Deucher1-0/+17
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2013-06-28radeonsi: add bonaire pci idsAlex Deucher1-0/+9
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2013-06-28mesa: Fix build with older gcc since update of glext.hTom Stellard1-2/+0
Reviewed-by: Brian Paul <brianp@vmware.com>
2013-06-26mesa: update glext.h to version 20130624Brian Paul1-10433/+8469
In glapi_priv.h we always need the typedef for the GLclampx type since GL_OES_fixed_point is now defined in glext.h but the GLclampx type is not. GLclampx is not used by anything in glext.h but we need it for GL ES dispatch. This is a huge patch because the structure of the file has been changed. The following extensions are new, however: GL_AMD_interleaved_elements GL_AMD_shader_trinary_minmax GL_IBM_static_data GL_INTEL_map_texture GL_NV_compute_program5 GL_NV_deep_texture3D GL_NV_draw_texture GL_NV_shader_atomic_counters GL_NV_shader_storage_buffer_object GL_NVX_conditional_render GL_OES_byte_coordinates GL_OES_compressed_paletted_texture GL_OES_fixed_point GL_OES_query_matrix GL_OES_single_precision And these extensions were removed: GL_FfdMaskSGIX GL_INGR_palette_buffer GL_INTEL_texture_scissor GL_SGI_depth_pass_instrument GL_SGIX_fog_scale GL_SGIX_impact_pixel_texture GL_SGIX_texture_select Reviewed-by: José Fonseca <jfonseca@vmware.com>
2013-06-06intel: Use the CHIPSET macro in the PCI ID tables for the device name.Kenneth Graunke3-110/+110
Putting the human readable device names directly in the PCI ID list consolidates things in one place. It also makes it easy to customize the name on a per-PCI ID basis without a huge code explosion. Based on a patch by Kristian Høgsberg. v2: Fix 830M/845G names and #undef CHIPSET (caught by Emit Velikov). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-06-06intel: Remove 'misc' parameter from CHIPSET macro in PCI ID tables.Kenneth Graunke3-110/+110
This has never actually been used for anything. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-06-05i965: Adding more reserved PCI IDs for Haswell.Rodrigo Vivi1-0/+24
At DDX commit Chris mentioned the tendency we have of finding out more PCI IDs only when users report. So Let's add all new reserved Haswell IDs. NOTE: This is a candidate for stable branches. Bugzilla: http://bugs.freedesktop.org/show_bug.cgi?id=63701 Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org>
2013-06-05mesa: remove outdated version lines in commentsRico Schüller4-4/+0
Signed-off-by: Brian Paul <brianp@vmware.com>
2013-05-14radeonsi: add Hainan pci idsAlex Deucher1-0/+7
Note: this is a candidate for the 9.1 branch Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>