sungmg/mutter-performance-source
1
0
Fork 0
Code Activity
mutter-performance-source/cogl/cogl-kms-display.h

98 lines
3 KiB
C
Raw Normal View History

kms: defer setting crtc modes until first swap buffers Instead of creating a dummy framebuffer allocation just so we can setup crtc modes during display_setup we now wait until the first swap_buffers request before setting up the crtc modes. This patch also adds a cogl_kms_display_queue_modes_reset() function that allows developers to explicitly queue a reset of the crtc modes. The idea is that applications that handle VT switching can use this for VT enter events to explicitly ensure their mode is restored since modes are often not automatically restored correctly. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-01-30 11:06:41 +00:00
/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
* Copyright (C) 2012 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
Mass rename CLUTTER_COMPILATION to COGL_COMPILATION Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit a99512e5798e48ffa3a9a1a7eb98bc55647ee1b6)
2012-06-20 17:49:08 +00:00
#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
kms: defer setting crtc modes until first swap buffers Instead of creating a dummy framebuffer allocation just so we can setup crtc modes during display_setup we now wait until the first swap_buffers request before setting up the crtc modes. This patch also adds a cogl_kms_display_queue_modes_reset() function that allows developers to explicitly queue a reset of the crtc modes. The idea is that applications that handle VT switching can use this for VT enter events to explicitly ensure their mode is restored since modes are often not automatically restored correctly. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-01-30 11:06:41 +00:00
#error "Only <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_KMS_DISPLAY_H__
#define __COGL_KMS_DISPLAY_H__
#include <cogl/cogl-types.h>
#include <cogl/cogl-display.h>
kms: add public API to override the default configuration of outputs Add API to allow complex applications using the KMS backend to go almost straight to direct configuration (which is not possible because Cogl needs to be in charge of buffers and FB objects). https://bugzilla.gnome.org/show_bug.cgi?id=705837 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 52fb8e1c33d8c83c731c05cee767928fdd5991d7)
2013-07-30 15:20:01 +00:00
#include <xf86drmMode.h>
Fixes for --disable-glib This fixes some problems which were stopping --disable-glib from working properly: • A lot of the public headers were including glib.h. This shouldn't be necessary because the API doesn't expose any glib types. Otherwise any apps would require glib in order to get the header. • The public headers were using G_BEGIN_DECLS. There is now a replacement macro called COGL_BEGIN_DECLS which is defined in cogl-types.h. • A similar fix has been done for G_GNUC_NULL_TERMINATED and G_GNUC_DEPRECATED. • The CFLAGS were not including $(builddir)/deps/glib which was preventing it finding the generated glibconfig.h when building out of tree. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0)
2012-11-22 18:01:10 +00:00
COGL_BEGIN_DECLS
kms: defer setting crtc modes until first swap buffers Instead of creating a dummy framebuffer allocation just so we can setup crtc modes during display_setup we now wait until the first swap_buffers request before setting up the crtc modes. This patch also adds a cogl_kms_display_queue_modes_reset() function that allows developers to explicitly queue a reset of the crtc modes. The idea is that applications that handle VT switching can use this for VT enter events to explicitly ensure their mode is restored since modes are often not automatically restored correctly. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-01-30 11:06:41 +00:00
/**
* cogl_kms_display_queue_modes_reset:
* @display: A #CoglDisplay
*
* Asks Cogl to explicitly reset the crtc output modes at the next
* #CoglOnscreen swap_buffers request. For applications that support
* VT switching they may want to re-assert the output modes when
* switching back to the applications VT since the modes are often not
* correctly restored automatically.
*
* <note>The @display must have been either explicitly setup via
* cogl_display_setup() or implicitily setup by having created a
* context using the @display</note>
*
* Since: 2.0
* Stability: unstable
*/
void
cogl_kms_display_queue_modes_reset (CoglDisplay *display);
kms: add public API to override the default configuration of outputs Add API to allow complex applications using the KMS backend to go almost straight to direct configuration (which is not possible because Cogl needs to be in charge of buffers and FB objects). https://bugzilla.gnome.org/show_bug.cgi?id=705837 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 52fb8e1c33d8c83c731c05cee767928fdd5991d7)
2013-07-30 15:20:01 +00:00
typedef struct {
uint32_t id;
uint32_t x, y;
drmModeModeInfo mode;
uint32_t *connectors;
uint32_t count;
} CoglKmsCrtc;
/**
* cogl_kms_display_set_layout:
* @onscreen: a #CoglDisplay
* @width: the framebuffer width
* @height: the framebuffer height
* @crtcs: the array of #CoglKmsCrtc structure with the desired CRTC layout
*
* Configures @display to use a framebuffer sized @width x @height, covering
* the CRTCS in @crtcs.
* @width and @height must be within the driver framebuffer limits, and @crtcs
* must be valid KMS API IDs.
*
* Calling this function overrides the automatic mode setting done by Cogl,
* and for this reason must be called before the first call to cogl_onscreen_swap_buffers().
*
* If you want to restore the default behaviour, you can call this function
* with @width and @height set to -1.
*
* Stability: unstable
*/
CoglBool
cogl_kms_display_set_layout (CoglDisplay *display,
int width,
int height,
CoglKmsCrtc **crtcs,
int n_crtcs,
CoglError **error);
Fixes for --disable-glib This fixes some problems which were stopping --disable-glib from working properly: • A lot of the public headers were including glib.h. This shouldn't be necessary because the API doesn't expose any glib types. Otherwise any apps would require glib in order to get the header. • The public headers were using G_BEGIN_DECLS. There is now a replacement macro called COGL_BEGIN_DECLS which is defined in cogl-types.h. • A similar fix has been done for G_GNUC_NULL_TERMINATED and G_GNUC_DEPRECATED. • The CFLAGS were not including $(builddir)/deps/glib which was preventing it finding the generated glibconfig.h when building out of tree. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 4138b3141c2f39cddaea3d72bfc04342ed5092d0)
2012-11-22 18:01:10 +00:00
COGL_END_DECLS
kms: defer setting crtc modes until first swap buffers Instead of creating a dummy framebuffer allocation just so we can setup crtc modes during display_setup we now wait until the first swap_buffers request before setting up the crtc modes. This patch also adds a cogl_kms_display_queue_modes_reset() function that allows developers to explicitly queue a reset of the crtc modes. The idea is that applications that handle VT switching can use this for VT enter events to explicitly ensure their mode is restored since modes are often not automatically restored correctly. Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-01-30 11:06:41 +00:00
#endif /* __COGL_KMS_DISPLAY_H__ */
Copy permalink