Chia-I Wu
58911b86a1
egl_dri2: allow RGBA masks to be specified for matching
...
Add rgba_masks to dri2_add_config. When it is non-NULL, the DRI config
is accepted only when the offsets and sizes of the its channels match
rgba_mask.
Reviewed-by: Chad Versace <chad@chad-versace.us>
2011-08-28 21:56:22 +08:00
Cooper Yuan
f5e757ea60
Destroy context in dri2/glx driver when apps call eglDestroyContext
2011-08-14 15:14:17 +08:00
Benjamin Franzke
32f4cf3808
egl/gbm: Fix EGL_DEFAULT_DISPLAY
2011-08-04 14:09:34 +02:00
Marek Olšák
5fe54df58f
Rename swrastg_dri to swrast_dri
...
I prefer it this way and it has been suggested earlier by others too.
Opinions?
2011-07-14 03:03:26 +02:00
Völgyes Dávid
f747d03b1d
Fixes for leaks reported by cppcheck.
2011-07-06 10:11:04 -04:00
Benjamin Franzke
992680c8b4
egl: Fix Terminate with shared gbm screens
...
NOTE: This is a candidate for the 7.11 branch.
2011-06-27 10:25:12 +02:00
Benjamin Franzke
629c15aaac
egl_dri2: Build drm platform only if enabled
2011-06-24 22:00:45 +02:00
Benjamin Franzke
e5fc4c81ce
egl_dri2: Hookup gbm as drm platform
2011-06-23 21:07:17 +02:00
Chia-I Wu
77e031a1c4
egl_dri2: try swrastg_dri if swrast_dri fails
...
Per libGL.
2011-06-13 12:19:39 +08:00
Chia-I Wu
cf69eeacc6
egl_dri2: add dri2_load_driver_swrast
...
Refactor dri2_load_driver and add dri2_load_driver_swrast for loading
swrast DRI driver.
2011-06-13 11:11:43 +08:00
Benjamin Franzke
16e30276e8
egl_dri2: Compare configs before matching them
...
This compares attribs like buffer size, and will prevent merging
unequal configs because of match criterion is e.g. ATLEAST.
2011-06-12 08:56:35 -04:00
Benjamin Franzke
b8325fd255
egl_dri2/wayland: Add support for EGL_DEFAULT_DISPLAY
2011-06-12 08:56:35 -04:00
Benjamin Franzke
83c68758be
egl_dri2: Discard similar configs
2011-05-13 09:31:09 -04:00
Kristian Høgsberg
93aea63a33
egl_dri2: Make it possible to not compile in the X11 platform
2011-05-13 09:31:09 -04:00
José Fonseca
5de2c67ba7
egl/dri2: Avoid unused static functions.
2011-05-12 15:24:26 +01:00
José Fonseca
4a47d6d46b
egl/dri2: Prevent uninitialized variable dereference.
2011-05-12 15:23:48 +01:00
José Fonseca
6a661895e9
egl: Fix int <-> ptr casts.
...
Based on zhigang gong <zhigang.gong@gmail.com>'s patch.
2011-05-12 15:12:16 +01:00
Kristian Høgsberg
e5169e9615
egl: Add a cursor use bit to MESA_drm_image
2011-05-06 10:33:50 -04:00
Benjamin Franzke
834b84149d
egl/wayland-drm: Generalize interface
...
Do not depend on _EGLDisplay and _EGLImage.
2011-05-06 10:33:50 -04:00
Kristian Høgsberg
a1bd012473
egl_dri2: We don't actually support KHR_gl_texture_2D_image
2011-03-26 10:57:31 -04:00
Kristian Høgsberg
981e338611
egl_dri2: Enable image extensions in one place
...
We know what we can support in egl_dri2.c so just enable the extensions
there.
2011-03-26 10:57:31 -04:00
Benjamin Franzke
4f6fbfa0ed
egl_dri2: Add attribute map for __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE
...
Broken since 6538b5824e
.
Thanks to iskren on #wayland for helping on finding this.
2011-03-07 00:32:05 +01:00
Benjamin Franzke
6b369c4c7c
egl: Add EGL_WL_bind_wayland_display
2011-03-01 17:23:50 -05:00
Haitao Feng
f55d027ac2
egl_dri2: add swrast
...
This enables the egl_dri2 driver to load swrast driver
for software rendering. It could be used when hardware
dri2 drivers are not available, such as in VM.
Signed-off-by: Haitao Feng <haitao.feng@intel.com>
2011-02-16 23:06:36 -05:00
Benjamin Franzke
4e8f95f64d
egl_dri2: Always unbind old contexts
...
This fixes __DRIdrawable refcounting.
Binding a context increases their refcount,
so we need to decrease it.
2011-02-10 23:07:01 -05:00
Benjamin Franzke
87dde5b1cd
egl_dri2: Use double buffering for window surfaces
2011-02-10 23:07:01 -05:00
Benjamin Franzke
93aea84f47
egl_dri2: Add wayland platform
2011-02-07 14:01:31 +01:00
Benjamin Franzke
a8128d7d4b
egl_dri2: Enable pixmap bind_to_texture according to the extension
2011-02-07 14:01:30 +01:00
Kristian Høgsberg
9dc5de5bb1
egl_dri2: Split out drm platform implementation to a separate file
2011-02-03 11:59:38 -05:00
Kristian Høgsberg
2889d9640f
egl_dri2: Split out x11 platform code
2011-02-03 11:59:38 -05:00
Chia-I Wu
218381d927
egl_dri2: Export glapi symbols for DRI drivers.
...
When an app loads libEGL.so dynamically with RTLD_LOCAL, loading DRI
drivers would fail because of missing glapi symbols. This commit makes
egl_dri2 load libglapi.so with RTLD_GLOBAL to export glapi symbols for
future symbol resolutions.
The same trick can be found in GLX. However, egl_dri2 can only do so
when --enable-shared-glapi is given. Because, otherwise, both libGL.so
and libglapi.so define glapi symbols and egl_dri2 cannot tell which
library to load.
2011-01-30 05:28:24 +08:00
Chia-I Wu
a22a332fc7
egl: Improve driver selection.
...
The idea is to be able to match a driver using the following order
try egl_gallium with hw renderer
try egl_dri2
try egl_gallium with sw renderer
try egl_glx
given the module list
egl_gallium
egl_dri2
egl_glx
For that, UseFallback initialization option is added. The module list
is matched twice: with the option unset and with the option set. In the
first pass, egl_gallium skips its sw renderer and egl_glx rejects to
initialize since UseFallback is not set. In the second pass,
egl_gallium skips its hw renderer and egl_dri2 rejects to initialize
since UseFallback is set. The process stops at the first driver that
initializes the display.
2011-01-13 18:15:45 +08:00
Chia-I Wu
655e459892
egl: Simplify driver matching.
...
Add initialization options that drv->API.Initialize should support.
Replace drv->Probe by TestOnly initialization option and simplify
_eglMatchDriver.
2011-01-13 18:10:38 +08:00
Chia-I Wu
a4a38dcf61
egl: Cleanup _EGLDisplay initialization.
...
Reorder/rename and document the fields that should be set by the driver during
initialization. Drop the major/minor arguments from drv->API.Initialize.
2011-01-13 17:57:38 +08:00
Chia-I Wu
39812c48df
egl_dri2: Fix eglGetProcAddress.
...
The driver struct is zeroed after dri2_load. Oops.
2011-01-12 18:10:15 +08:00
Chia-I Wu
c98ea26e16
egl: Make egl_dri2 and egl_glx built-in drivers.
...
These two drivers are small in size. Making them built-in should
simplify packaging.
2011-01-10 11:50:34 +08:00
Chia-I Wu
fef5d14494
egl_dri2: Look up _glapi_get_proc_address dynamically.
...
In preparation for making egl_dri2 built-in. It also handles
symbol lookup error: /usr/local/lib/egl/egl_dri2.so: undefined symbol:
_glapi_get_proc_address
more gracefully.
2011-01-10 11:23:24 +08:00
Juan Zhao
e59fa4c46c
dri2: release texture image.
...
Add release function for texture_from_pixmap extension.
Some platform need to release texture image for texture_from_pixmap
extension, add this interface for those platforms.
2011-01-09 14:55:16 -05:00
Chia-I Wu
1f4c55128b
egl_dri2: Fix one context, multiple surfaces.
...
When a context was made current to another surface, the old code did
this
dri2_dpy->core->bindContext(cctx, ddraw, rdraw);
dri2_dpy->core->unbindContext(old_cctx);
and there will be no current context due to the second line.
unbindContext should be called only when bindContext is not. This fixes
a regression since d19afc57
. Thanks to Neil Roberts for noticing the
issue and creating a test case.
2010-11-24 14:06:30 +08:00
Robert Hooker
778917069c
egl_dri2: Add missing intel chip ids.
...
Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
2010-11-17 12:10:53 -08:00
Chia-I Wu
aa139a14ba
egl_dri2: Fix __DRI_DRI2 version 1 support.
...
Correctly set __DRI_API_OPENGL flag.
2010-11-10 23:57:50 +08:00
Alex Deucher
4990b771de
egl_dri2: Add radeon chip ids
2010-11-08 19:59:53 -05:00
Chia-I Wu
547e7619aa
egl_dri2: Fix a typo that make glFlush be called at wrong time.
...
We want to call glFlush when there is a current context. That is,
old_ctx. This is a regression introduced by
d19afc57fe
.
2010-10-26 15:04:28 +08:00
Chia-I Wu
d19afc57fe
egl: Use reference counting to replace IsLinked or IsBound.
...
Remove all _egl<Res>IsLinked and _egl<Res>IsBound. Update
_eglBindContext and drivers to do reference counting.
2010-10-23 15:26:28 +08:00
Chia-I Wu
8a6bdf3979
egl: Minor changes to the _EGLConfig interface.
...
Mainly to rename _eglAddConfig to _eglLinkConfig, along with a few clean
ups.
2010-10-23 11:20:40 +08:00
Chia-I Wu
5664a98386
egl: Parse image attributes with _eglParseImageAttribList.
...
Avoid code duplications.
2010-10-22 18:35:09 +08:00
Chia-I Wu
713c8734f4
egl: Move attributes in _EGLImage to _EGLImageAttribs.
...
The opaque nature of EGLImage implies that extensions almost always
define their own attributes. Move attributes in _EGLImage to
_EGLImageAttribs and add a helper function to parse attribute lists.
2010-10-22 17:15:45 +08:00
Chia-I Wu
b67f7295b7
egl_dri2: Drop the use of _egl[SG]etConfigKey.
...
_EGLConfig can be directly dereferenced now.
2010-10-22 16:26:25 +08:00
Ian Romanick
e4bd50c232
egl: Fix several 'comparison between signed and unsigned integer' warnings
...
I hate GCC for requiring the (int) cast on sizeof.
2010-09-24 10:55:38 -07:00
Ian Romanick
137fce247f
EGL DRI2: Silence 'missing initializer' warnings
2010-09-24 09:40:06 -07:00
Ian Romanick
eade946cbf
EGL DRI2: Silence piles of 'unused variable' warnings
2010-09-24 09:40:06 -07:00
Kristian Høgsberg
17eace581d
dri: Pass the __DRIscreen and the __DRIscreen private back to image lookup
...
We will typically have a current context when we need to lookup the image,
but the lookup implementation don't need it so drop it.
2010-09-22 22:02:05 -04:00
Kristian Høgsberg
9ec0b2a45e
dri2: Make createImageFromName() take a __DRIscreen instead of __DRIcontext
...
We can't expect to have a context when this is called, and we don't need one
so just require a __DRIscreen instead.
Reported by Yu Dai <yu.dai@intel.com>
2010-09-22 15:08:22 -04:00
Jesse Barnes
e7eff0cfce
EGL DRI2: 0xa011 is Pineview not Ironlake
...
Point about needing a better way to do this validated.
2010-09-13 10:55:56 -07:00
Jesse Barnes
c121608b6e
EGL DRI2: add PCI ID for Ironlake mobile
...
Allows KMS EGL driver to load. We need a better way of doing this.
2010-09-13 10:36:46 -07:00
Kristian Høgsberg
5aaa53e66c
egl_dri2: Add support for MESA_image_drm
2010-08-25 09:17:48 -04:00
Kristian Høgsberg
e8a72460b7
egl_dri2: Set API version for DRM display
2010-07-29 15:08:00 -04:00
Kristian Høgsberg
efd4a8cffd
egl_dri2: Implement EGL_KHR_surfaceless_* extensions
2010-07-28 23:07:09 -04:00
Kristian Høgsberg
2168b87b51
egl_dri2: Support _EGL_PLATFORM_DRM
...
This lets the egl_dri2 driver initialize on just a DRM fd.
2010-07-08 20:10:37 -04:00
Chia-I Wu
6717a313f2
egl: Store configs in a dynamic array.
2010-06-30 18:32:48 +08:00
Chia-I Wu
f22665df95
egl: Introduce platform displays internally.
...
This commit introduces type-safe platform displays internally. A
platform display consists of a generic pointer and an enum that
specifies the platform.
An EGLDisplay is created from a platform display. Native displays
become platform displays whose platform is determined by
_eglGetNativePlatform(). Platform windows and pixmaps may also be
introduced if needed.
2010-06-23 15:14:59 +08:00
Kristian Høgsberg
0defc25977
egl_dri2: Split driver loading out into its own function
2010-05-28 21:31:22 -04:00
Kristian Høgsberg
c5ddaa2cd7
egl_dri2: Check for xcb_connect() failure the right way
...
It always returns a valid xcb_connection_t, but if connection failed, it's in the
error state.
2010-05-28 21:31:22 -04:00
Eric Anholt
6f77b751b6
Make TLS EGL dri2 driver search path behavior match TLS GLX dri2 behavior.
2010-05-20 14:44:43 -07:00
Kristian Høgsberg
5dc0f49084
egl: Implement EGL_NOK_texture_from_pixmap
...
This extension allows a color buffer to be used for both rendering and
texturing. EGL allows the use of color buffers of pbuffer drawables
for texturing, this extension extends this to allow the use of color
buffers of pixmaps too.
2010-05-14 14:47:54 -04:00
Kristian Høgsberg
52c554a79d
egl: Implement EGL_NOK_swap_region
...
This extension adds a new function which provides an alternative to
eglSwapBuffers. eglSwapBuffersRegionNOK accepts two new parameters in
addition to those in eglSwapBuffers. The new parameters consist of a
pointer to a list of 4-integer blocks defining rectangles (x, y,
width, height) and an integer specifying the number of rectangles in
the list.
2010-05-13 20:30:45 -04:00
Kristian Høgsberg
7413d9ae9f
egl_dri2: Downgrade initialization errors to warnings
...
Don't want to shutdown everything if egl_dri2 fails to initialize.
2010-05-13 16:14:07 -04:00
Kristian Høgsberg
880acbe177
egl_dri2: Zero out driver struct
...
Otherwise testing ->Probe for non-NULL and calling it goes boom.
2010-05-12 14:34:55 -04:00
Kristian Høgsberg
0870e4a202
Merge branch 'gles2-2'
...
Conflicts:
src/mesa/drivers/dri/common/dri_util.h
2010-05-02 10:17:07 -04:00
Kristian Høgsberg
e2fd98d794
egl_dri2: Use new DRI API to create a GLES1/2 context when asked to
2010-04-28 14:05:21 -04:00
Jakob Bornecrantz
6fc532ae05
Merge branch '7.8'
2010-04-28 16:27:51 +01:00
Micah Fedke
9cfaaa291f
egl: dri2 driver error output
...
This patch amends the error output string for the case where the
dri2 egl driver could not open the dri dev node.
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-04-28 07:26:01 -06:00
Kristian Høgsberg
3a82c8c562
egl_dri2: Enable KHR_gl_texture_2D_image
...
Forgot to set the enabled bit when I implemented the extension.
2010-04-14 16:22:48 -04:00
Chia-I Wu
d18d0fdcd8
egl_dri2: Flush before context switch and swap buffers.
...
DRI does not define any callback to flush the current context. GLX
loader simply calls glFlush. Follow the GLX loader here.
2010-04-06 19:54:06 +08:00
Kristian Høgsberg
4007342584
egl_dri2: Factor out DRI2 protocol bits from initialize.
2010-03-03 10:47:49 -05:00
Kristian Høgsberg
557c20b309
egl_dri2: Implement EGL_KHR_gl_renderbuffer_image
2010-02-26 14:52:14 -05:00
Kristian Høgsberg
f4e7d1b1e5
egl_dri2: Implement EGL_KHR_image and EGL_KHR_image_pixmap
2010-02-24 14:28:42 -05:00
Kristian Høgsberg
c19dab7c59
egl_dri2: Only allocate config if we're going to keep it
...
Small optimization.
2010-02-09 21:24:15 -05:00
Kristian Høgsberg
c3c1a7e1d9
egl_dri2: Initialize config attributes with visual id and class from X
2010-02-09 21:24:15 -05:00
Kristian Høgsberg
360faf80ca
egl_dri2: Allow pbuffer and pixmap surfaces for all configs
2010-02-09 21:24:14 -05:00
Kristian Høgsberg
bba5a98dfd
egl_dri2: Implement eglBindTexImage()
2010-02-09 15:55:25 -05:00
Kristian Høgsberg
8c593d3ea9
egl_dri2: Use a helper function for looking up and binding extensions
2010-02-09 15:55:24 -05:00
Kristian Høgsberg
538539d879
egl_dri2: Fix initialization with EGL_DEFAULT_DISPLAY
2010-02-09 09:51:05 -05:00
Kristian Høgsberg
832f2d3c39
egl_dri2: Log both driver and core extensions
2010-02-05 12:01:28 -05:00
Kristian Høgsberg
9c94faeff1
egl_dri2: Audit and fix errors paths
2010-02-05 12:01:28 -05:00
Kristian Høgsberg
f27b4fadca
egl_dri2: Just cast the pointer difference to an int
2010-02-05 12:01:27 -05:00
Chia-I Wu
a35e63382e
egl_dri2: Use _EGL_DRIVER_STANDARD_TYPECASTS.
...
It saves the driver from defining the boring typecasts itself.
2010-02-05 11:45:01 +08:00
Chia-I Wu
fc5ca85a63
egl_dri2: Do not destroy linked resources.
...
A linked resource is stil owned by the display.
2010-02-05 11:45:01 +08:00
Chia-I Wu
7e7c1ba40b
egl_dri2: Fix a snprintf warning.
...
The subtraction between two pointers has type unsigned int (only on
x86-64?), while the format string expects an int.
2010-02-05 11:44:49 +08:00
Chia-I Wu
8d411c9a12
egl_dri2: Add a debug print for DRI2 extensions.
2010-02-05 11:44:16 +08:00
Kristian Høgsberg
c6e830c393
egl: Implement eglCopyBuffers for DRI2, make pixmap and pbuffers actually work
2010-02-04 21:50:23 -05:00
Kristian Høgsberg
42fa009e64
egl: Add driver for EGL on X with DRI2
2010-02-04 15:03:45 -05:00