AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

Closes #3196

See merge request GNOME/gtk!2662
This commit is contained in:
Matthias Clasen 2020-10-06 00:57:30 +00:00
commit ccdc10d9df
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/listview_ucd.c
View File

@ -2,6 +2,8 @@
* *
* This demo shows a multi-column representation of some parts * This demo shows a multi-column representation of some parts
* of the Unicode Character Database, or UCD. * of the Unicode Character Database, or UCD.
*
* The dataset used here has 33 796 items.
*/ */
#include <gtk/gtk.h> #include <gtk/gtk.h>

14
gdk/gdkglcontext.c
View File

@ -864,7 +864,7 @@ gdk_gl_context_get_use_es (GdkGLContext *context)
return priv->use_es > 0; return priv->use_es > 0;
} }
#ifdef G_ENABLE_CONSISTENCY_CHECKS #ifdef G_ENABLE_DEBUG
static void static void
gl_debug_message_callback (GLenum source, gl_debug_message_callback (GLenum source,
GLenum type, GLenum type,
@ -1008,8 +1008,11 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
priv->has_debug_output = epoxy_has_gl_extension ("GL_ARB_debug_output") || priv->has_debug_output = epoxy_has_gl_extension ("GL_ARB_debug_output") ||
epoxy_has_gl_extension ("GL_KHR_debug"); epoxy_has_gl_extension ("GL_KHR_debug");
#ifdef G_ENABLE_CONSISTENCY_CHECKS #ifdef G_ENABLE_DEBUG
if (priv->has_debug_output) display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
gl_debug = GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG);
if (priv->has_debug_output && gl_debug)
{ {
gdk_gl_context_make_current (context); gdk_gl_context_make_current (context);
glEnable (GL_DEBUG_OUTPUT); glEnable (GL_DEBUG_OUTPUT);
@ -1039,11 +1042,6 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
priv->is_legacy = TRUE; priv->is_legacy = TRUE;
} }
#ifdef G_ENABLE_DEBUG
display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
gl_debug = GDK_DISPLAY_DEBUG_CHECK (display, GL_DEBUG);
#endif
if (priv->has_khr_debug && gl_debug) if (priv->has_khr_debug && gl_debug)
{ {
priv->use_khr_debug = TRUE; priv->use_khr_debug = TRUE;

8
gsk/resources/glsl/linear_gradient.glsl
View File

@ -9,8 +9,8 @@ _OUT_ vec2 endPoint;
_OUT_ float maxDist; _OUT_ float maxDist;
_OUT_ vec2 gradient; _OUT_ vec2 gradient;
_OUT_ float gradientLength; _OUT_ float gradientLength;
_OUT_ vec4 color_stops[8]; _OUT_ vec4 color_stops[6];
_OUT_ float color_offsets[8]; _OUT_ float color_offsets[6];
void main() { void main() {
gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0); gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
@ -44,8 +44,8 @@ _IN_ vec2 endPoint;
_IN_ float maxDist; _IN_ float maxDist;
_IN_ vec2 gradient; _IN_ vec2 gradient;
_IN_ float gradientLength; _IN_ float gradientLength;
_IN_ vec4 color_stops[8]; _IN_ vec4 color_stops[6];
_IN_ float color_offsets[8]; _IN_ float color_offsets[6];
void main() { void main() {
// Position relative to startPoint // Position relative to startPoint

8
gsk/resources/glsl/radial_gradient.glsl
View File

@ -7,8 +7,8 @@ uniform vec2 u_radius;
uniform vec2 u_center; uniform vec2 u_center;
_OUT_ vec2 center; _OUT_ vec2 center;
_OUT_ vec4 color_stops[8]; _OUT_ vec4 color_stops[6];
_OUT_ float color_offsets[8]; _OUT_ float color_offsets[6];
_OUT_ float start; _OUT_ float start;
_OUT_ float end; _OUT_ float end;
@ -39,8 +39,8 @@ uniform vec2 u_radius;
uniform float u_end; uniform float u_end;
_IN_ vec2 center; _IN_ vec2 center;
_IN_ vec4 color_stops[8]; _IN_ vec4 color_stops[6];
_IN_ float color_offsets[8]; _IN_ float color_offsets[6];
_IN_ float start; _IN_ float start;
_IN_ float end; _IN_ float end;