AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity
74,901 Commits 969 Branches 749 Tags 504 MiB
cca5de3c7f
Commit Graph

657 Commits

Author SHA1 Message Date
Timm Bäder
ceb61e6600 gskglcommandqueue: Mark some variables G_GNUC_UNUSED 
These are unused if sysprof isn't being used.
 2021-12-16 11:06:50 +01:00
Timm Bäder
fd6b3ef5a0 gl: Linear gradients don't support 3d transforms 
Add another helper similar to the one for transforms, but that only
works on 2d transforms.

Fixes #4501
 2021-12-12 12:57:44 +01:00
Chun-wei Fan
652ab1ac72 gskglcompiler.c: Force GLSL version 300 es as needed 
For libANGLE to work with our shaders, we must use "300 es" for
the #version directive in our shaders, as well as using the non-legacy/
non-GLES codepath in the shaders.  In order to check whether we are
using the GLSL 300 es shaders, we check whether we are using a GLES 3.0+
context.  As a result, make ->glsl_version a const char* and make sure
the existing shader version macros are defined apprpriately, and add a
new macro for the "300 es" shader version string.

This will allow the gtk4 programs to run under Windows using EGL via
libANGLE.  Some of the GL demos won't work for now, but at least this
makes things a lot better for using GL-accelerated graphics under Windows
for those that want to or need to use libANGLE (such as those with
graphics drivers that aren't capable of our Desktop (W)GL requirements in
GTK.
 2021-12-03 10:39:59 +08:00
Chun-wei Fan
a619e8af4a gskglcompiler.c: Relax check for GL 3.x+ legacy contexts 
On Windows with nVidia drivers at least, when we create a legacy context
via wglCreateContext(), we may still get a (W)GL 4.x context.  Allow
such contexts to also use GLSL version 130 instead of 110, so that
things do continue to work.
 2021-12-01 17:29:02 +08:00
Benjamin Otte
ade7509b97 GL renderer: Remove noperspective usage 
It causes issues with compilation of GLES shaders and isn't in any
way correct.
 2021-11-30 14:12:10 +01:00
Matthias Clasen
5b1cd335bb Go back to using pango for glyph rendering 
Using just cairo makes us lose hexboxes. So, until
we implement that ourselves, go back to using pango.
 2021-11-20 11:13:52 -05:00
Benjamin Otte
95574f98c4 gl: Use GL_BACK_LEFT 
The spec doesn't allow GL_BACK, but many drivers do. Use the
spec-accepted equivalent instead.

Fixed #4402
 2021-11-03 22:53:59 +01:00
Benjamin Otte
2b2fd23815 Merge branch 'wip/otte/center-center-center' into 'master' 
Add a bunch of reftests and fix their failures

Closes #4285

See merge request GNOME/gtk!4085
 2021-10-22 16:35:41 +00:00
Benjamin Otte
b912e84df7 gl: Call make_current() before doing any GL work 
But don't call it too early, we only want to call it once we have
prepared the target.

This way, we guarantee that a GL context is always available and that it
is bound to the correct target.
 2021-10-22 17:51:40 +02:00
Benjamin Otte
cb03fe8f31 gsk: Allow gsk_renderer_realize (renderer, NULL, NULL) 
That way, we can use renderers without surfaces.
 2021-10-20 21:49:32 +02:00
Benjamin Otte
9a2e9c5be4 gl: Use gdk_memory_texture_new_from_texture() 
Way less code to prepare the texture in a proper format.
 2021-10-13 14:33:44 +02:00
Benjamin Otte
ddc4a40c33 gl: Refactor texture uploading 
Don't pass texture + rect, but instead have
  gdk_memory_texture_new_subtexture()
and use it to generate subtextures and pass them.

This has the advantage of downloading the a too large texture only once
instead of N times.
 2021-10-13 14:33:44 +02:00
Benjamin Otte
5199bebdb5 gl: Move texture uploading to the renderer 
It does not belong in GdkGLContext, it's a renderer thing.
It's also the only user of that API.

Introduce gdk_gl_context_check_version() private API to make version
checks simpler.
 2021-10-13 14:33:44 +02:00
Benjamin Otte
31e9072906 gl: Fix downloading textures *again* 
It turns out glReadPixels() cannot convert pixels and you are only
allowed to pass a single value into the function arguments. You need to
know which ones or things will explode.

GL is great.
 2021-10-13 14:33:44 +02:00
Benjamin Otte
b65b64628d texture: Refactor downloading 
Pass a format do GdkTextureClass::download(). That way we can download
data in any format.

Also replace gdk_texture_download_texture() with
gdk_memory_texture_from_texture() which again takes a format.

The old functionality is still there for code that wants it: Just pass
gdk_texture_get_format (texture) as the format argument.
 2021-10-12 02:06:43 +02:00
Matthias Clasen
49a64da7ec Merge branch 'ngl-is-the-new-gl' into 'master' 
Rename ngl to gl

Closes #4318

See merge request GNOME/gtk!4037
 2021-10-11 06:43:41 +00:00
Matthias Clasen
b7eb1d3310 gsk: provide an ngl renderer 
Provide a minimal renderer implementation that fails
in realize. This avoids reusing the same type, which
might give bindings trouble.
 2021-10-07 16:46:29 -04:00
Matthias Clasen
7a1644bc97 Maintain abi 
Keep gsk_ngl_renderer_new and gsk_ngl_renderer_get_type,
since they were part of the abi in 4.2, and in an
installed header.

Fixes: #4318
 2021-10-07 13:05:53 -04:00
Matthias Clasen
144f727d5a Rename ngl to gl 
We have only one gl renderer now, and it is
a bit odd for it not be called gl.
 2021-10-07 13:05:53 -04:00
Matthias Clasen
e9e373913e gsk: Drop the gl renderer 
ngl supports all the same platforms as gl
now, and has seen more improvements in the
last cycle.
 2021-08-20 22:58:30 -04:00
Benjamin Otte
c7320df0c9 gdk: Add gdk_gl_context_is_shared() 
... and use it in the GL renderers.
 2021-07-22 16:27:31 +02:00
Matthias Clasen
578db92973 Cosmetics: Eradicate gint 
Remove a handful of errant uses of gint.
 2021-06-03 17:41:28 -04:00
Matthias Clasen
2d266d107b gsk: Clean up docs syntax 
Replace leftover gtk-doc syntax (#Type) with backquotes.
 2021-05-22 17:25:26 -04:00
Alexander Mikhaylenko
ae7f380396 gsk: Fix shader gresource paths 
They were never updated after having been moved.
 2021-04-19 20:01:33 +05:00
Matthias Clasen
9d3aa2cfce gsk: Avoid compiler warnings without assertions 
Disabling assertions was provoking some unused variable
warnings from the compiler. Avoid these.
 2021-04-12 21:22:46 -04:00
Matthias Clasen
900a4e4d31 gsk: Move shader resources 
Move the resources of each renderer to its subdirectory.
We've previously done that for the ngl renderer, but it
is better to be consistent and do it for all the renderers.
 2021-04-03 08:24:58 -04:00
Matthias Clasen
ee63b84b6a gsk: Rename resource paths 
Make the shaders of the gl renderer live under
/org/gtk/libgsk/gl. This is purely cosmetic.
 2021-04-03 08:10:58 -04:00
Matthias Clasen
bd0df03248 gl: Fix a rounding error in subpixel positioning 
1024 / 4 is 256, not 250.
 2021-03-21 16:05:10 -04:00
Matthias Clasen
ca3120919f docs: Improve gsk docs 
Convert link formats, add summaries, and make
a few missing things show up in the docs.
 2021-03-11 16:37:31 +00:00
Matthias Clasen
dff2aa20ff gl: Fixed clipped offscreen rendering 
When we are rendering a texture node to an offscreen,
and we have a clip, we must force the offscreen rendering.
Otherwise, the code will notice: Hey, it already is a texture
node, so no need to render it to a texture again. But when
clipping is involved, that is exactly what we want to do.

Testcase included.

Fixes: #3651
 2021-02-09 22:43:15 -05:00
Timm Bäder
79f273348d gl renderer: Fix viewport computation when rendering offscreen 
Fixes #3615
 2021-01-29 10:37:48 +01:00
Timm Bäder
8ebcef97ff shader builder: Improve error output 2021-01-29 09:45:25 +01:00
Matthias Clasen
0d0bdaa02e gsk: Fix a thinko 
With subpixel positioning, we need to offset the
cached glyphs by their phase.
 2021-01-28 18:16:16 -05:00
Fabio Lagalla
d83502d054 gskglshaderbuilder: bind correct uv location 2021-01-28 17:08:46 +01:00
Fabio Lagalla
a1dd6521e8 gskglrenderer: Remove switch fallthrough comments 2021-01-27 12:52:11 +01:00
Fabio Lagalla
0088f840fe gskrendernode: Cache angle in conic gradients 2021-01-27 12:44:10 +01:00
Fabio Lagalla
1b698c896e gskglrenderer: Use gboolean instead of bool 2021-01-27 12:44:10 +01:00
Fabio Lagalla
04000f28e7 gskglrenderer: First class support of repeating-radial-gradient 2021-01-27 12:44:10 +01:00
Fabio Lagalla
976a05f6eb gskglrenderer: First class support of repeating-linear-gradient 2021-01-27 12:44:10 +01:00
Fabio Lagalla
b15902bf44 gskglrenderer: Optimize conic-gradient shader 2021-01-27 12:44:10 +01:00
Fabio Lagalla
5ac7529771 gskglrenderer: Optimize radial-gradient shader 2021-01-27 12:44:10 +01:00
Fabio Lagalla
bbf68c0d9d gskglrenderer: Optimize linear-gradient shader 2021-01-27 12:44:10 +01:00
Timm Bäder
d9f6b268d3 gl renderer: Use rect_contains_rect() copy 
And this way the contains_rect() inside
rounded_inner_rect_contains_rect() goes from 3.3% to 0.79% in the
fishbowl when rendering the levelbars.
 2021-01-17 04:39:26 +01:00
Timm Bäder
4d7a01562e gl renderer: Don't reset offset when drawing offscreen 2021-01-17 04:39:26 +01:00
Timm Bäder
650eed7f72 gl renderer: Properly y-flip non-offscreen children of rounded clips 2021-01-17 04:39:26 +01:00
Fabio Lagalla
8c61038b9f gl renderer: print fragment shader info 
It was logged twice the vertex shader info, instead
 2021-01-11 17:06:03 +01:00
xndcn
34ffdc6e3f gl: Fix implicit leaking of shader object 
According to OpenGL spec, a shader object will only be flagged
for deletion unless it has been detached; when a program object
is deleted, those shader objects attached to it will be detached
but not deleted unless they have already been flagged for deletion.

So we shall detach a shader object before it is deleted, and delete
it before the program object is deleted best.
 2020-12-29 23:50:45 +08:00
Timm Bäder
526c76181e gl renderer: Check for pointer equality in rounded_rect_equal 2020-12-21 15:22:08 +01:00
Timm Bäder
e1cf0cff26 gl renderer: Proper state tracking for color matrix ops 2020-12-21 10:26:03 +01:00
Timm Bäder
634fa772c9 gl renderer: Add missing debug output for repeat ops 2020-12-21 10:26:03 +01:00
Timm Bäder
4b3bbe0ecd gl renderer: Create shader-global uniform ops on draw() 
This way we can render the first frame of tests/testoutsetshadowdrawing
in 153 ops instead of 183.

And the first frame of gtk4-demo in 260 instead of 300.
 2020-12-21 10:26:03 +01:00
Timm Bäder
cde43541d0 gl renderer: Unify new clip/viewport rects in blur_texture() 2020-12-21 10:26:03 +01:00
Timm Bäder
a8213d7f45 gl renderer: Avoid setting modelview to identical values 
The previous comment here was incorrect. We can save the op itself, we
just can't save us the entry in the modelview stack.
 2020-12-21 10:26:02 +01:00
Matthias Clasen
d5143a1bf0 Revert "gl renderer: Render too big textures to the clipped area" 
This reverts commit 7f6608cbed.
 2020-12-19 11:43:56 -05:00
Matthias Clasen
12611fa142 Revert "gl renderer: Take a out graphene_rect in blur_node()" 
This reverts commit 7eece7e769.
 2020-12-19 11:43:43 -05:00
Timm Bäder
7eece7e769 gl renderer: Take a out graphene_rect in blur_node() 2020-12-16 09:13:12 +01:00
Timm Bäder
7f6608cbed gl renderer: Render too big textures to the clipped area 2020-12-16 08:26:46 +01:00
Timm Bäder
f816a8fb82 gl renderer: Unify viewport setting in add_offscreen_ops() 
We use the same rect here a few times.
 2020-12-16 08:26:46 +01:00
Timm Bäder
33ed42d985 gl renderer: Remove RESET_OPACITY flag 
We always need to do that (and always passed the flag to
add_offscreen_ops() anyway).
 2020-12-06 20:03:35 +01:00
Timm Bäder
1ee4f6138b gl renderer: Reset opacity when rendering blend node children 
We render those on a texture, so we need to reset the opacity because
that will be applied when rendering the resulting texture.
 2020-12-06 20:01:36 +01:00
Timm Bäder
7b61ef9e0f gl renderer: Initialize rounded rect early 2020-12-06 19:57:48 +01:00
Timm Bäder
b46d077b3a gl renderer: Fix rendering clipped blurred inset shadow nodes 2020-12-06 19:18:10 +01:00
Timm Bäder
e32331d002 gl renderer: Ignore crossfades between equal texture nodes 2020-12-06 19:18:10 +01:00
Timm Bäder
05928608ec gl renderer: Use scale_x and scale_y everywhere 
Try to handle two different values for scale in horizontal and vertical
direction better.

Fixes #3431
 2020-12-06 19:18:05 +01:00
Christian Hergert
6883c2214b gl: specify attribute locations for vUv and aPosition 
These positions are not guaranteed to be in a specific order when linked
into the final GPU program. They need to be specified so that our code
in gskglrenderer.c can use known positions for them to match up with
our GskQuadVertex.

This fixes the GL renderer on macOS's OpenGL shader compiler.

Fixes #3420
 2020-12-04 13:33:34 -08:00
Benjamin Otte
2c1bd399d2 glrenderer: Implement a shader for conic gradients 2020-12-03 13:07:17 +01:00
Benjamin Otte
c907ad83b0 glrenderer: Emit more useful error messages 
Catch the error when it happens, so that we can emit a specific and more
helpful error message.

Also verify that all branches in the code now do indeed set a proper
GError when they fail, so that the final catch-all is no longer needed.
Instead, assert that the error is set so that we catch future code
additions early that do not set the GError.
 2020-12-03 13:07:17 +01:00
Benjamin Otte
55a242bd81 gsk: Add GskConicGradientNode 2020-12-03 00:47:54 +01:00
Timm Bäder
da514187f5 gl renderer: Make minimal rounded rects more minimal 2020-11-30 09:21:34 -05:00
Christian Hergert
82b4c34eca gl: add some debugging information to DEBUG_OPS 2020-11-18 20:16:40 -08:00
Christian Hergert
eae5eaeb21 gl: use glFramebufferTexture2D to set framebuffer texture 
When mapping a texture to the framebuffer, we can use the 2D
form instead of the cube mapping form.
 2020-11-18 20:09:01 -08:00
Benjamin Otte
1c7daece7a Merge branch 'wip/otte/for-master' into 'master' 
Wip/otte/for master

See merge request GNOME/gtk!2855
 2020-11-17 19:08:01 +00:00
Benjamin Otte
f2284ff40f rendernode: Rename all gsk_render_node_peek_*() functions 
Those are getters, they should be gsk_render_node_get_*() functions.
 2020-11-17 19:04:39 +01:00
Christian Hergert
12a9164414 gsk: use glFrameBufferTexture2D and release texture 
glFrameBufferTexture maps to all faces of a cube and that is not needed
here. Additionally, texture_id is not deleted after we use the additional
flipped texture, but should be.
 2020-11-16 09:26:07 -08:00
Emmanuel Gil Peyrot
08193ecf1c gl renderer: Generate queries only on desktop GL 
On desktop GL, GL 1.5 or GL_ARB_occlusion_query is required to get the
glGenQueries() etc. symbols.  This isn’t the case on GLES, where they
are provided by GL_EXT_occlusion_query_boolean, and more importantly
have never been made core.

This patch allows gtk4-demo to start when GDK_DEBUG=gl-gles is set, on
my Mali 400 MP running the Lima driver from Mesa.
 2020-11-07 21:49:42 +01:00
Timm Bäder
82ca65956f gl renderer: Make debugging code shorter 2020-11-02 14:55:14 -05:00
Timm Bäder
c8c2106f3e gl renderer: Refactor vertex data loading code 2020-11-02 14:55:14 -05:00
Timm Bäder
8178dfb85a gl renderer: Use the load_vertex_data* functions more often 2020-11-02 14:55:14 -05:00
Timm Bäder
50e78198a8 gl renderer: More load_vertex_data* usage 2020-11-02 14:55:14 -05:00
Timm Bäder
ee04cbcfa8 gl renderer: Reword a comment 2020-11-02 14:55:14 -05:00
Timm Bäder
fc312f7ffe gl renderer: Remove an outdated comment 2020-11-02 14:55:14 -05:00
Timm Bäder
e6e964c3f3 gl renderer: Refactor rendering shadow nodes 
Also use load_vertex_data_with_region here.
 2020-11-02 14:55:14 -05:00
Timm Bäder
df5e796d99 gl renderer: Refactor blurred shadow drawing code 
We already have various load_vertex_data* code, so try to reuse that
here.
 2020-11-02 14:55:14 -05:00
Timm Bäder
d3239c953d gl renderer: Nine-slice unblurred outset shadows 
See #3284
 2020-11-02 14:55:13 -05:00
Timm Bäder
9109dee072 gl renderer: Don't use blur node bounds 
The blur node bounds are different/larger than the ones we use. This
made the textures get stretched to the blur node bounds.

Fixes #3282
 2020-10-22 17:46:34 +02:00
Timm Bäder
b6a843a05b gl renderer: Fix two scale_x/y mixups 2020-10-22 17:46:34 +02:00
Timm Bäder
07fb33c033 gl renderer: Fix private function name 
It's a GskGLRenderer, not a GskGLRender
 2020-10-14 15:06:12 -04:00
Timm Bäder
1fe7043be4 gl renderer: Add more scale_x/scale_y code 
We really need all of this to be aware of both dimensions of course...
 2020-10-14 15:06:12 -04:00
Timm Bäder
0a4d442849 gl renderer: return empty texture for too small blurred nodes 2020-10-14 15:06:12 -04:00
Timm Bäder
5f9fa13c65 gl renderer: Use op builder to render flipped texture 
Otherwise, we don't know about the uniform state
 2020-10-14 15:06:12 -04:00
Timm Bäder
161b171004 gl renderer: Remove unused parameter 2020-10-14 15:06:12 -04:00
Timm Bäder
eb345cd033 gl renderer: Use nearest filtering for textures in render_texture() 
Makes the output in the node editor a bit more bearable.
 2020-10-14 15:06:12 -04:00
Timm Bäder
4735c27e69 gl renderer: Avoid some code duplication 2020-10-14 15:06:12 -04:00
Timm Bäder
44f10c5861 gl renderer: Flip texture in render_texture() 2020-10-14 15:06:12 -04:00
Timm Bäder
ddcff9eb0f gl renderer: simplify ->render() implementation a bit 
We already use self->scale_factor when initialized whole_surface,
so set self->scale_factor first.
 2020-10-14 15:06:12 -04:00
Timm Bäder
9fe21b7181 shaderbuilder: Print error message after source code 
My terminal scrolls down, so showing the error message last makes sense.
 2020-10-14 15:06:12 -04:00
Timm Bäder
7bf858b9d0 gl renderer: Add a helper to setup projection matrix 2020-10-14 15:06:12 -04:00
Timm Bäder
bc034d1190 gl renderer: Ignore rendering if accumulated opacity is too small 2020-10-14 15:06:12 -04:00
Alexander Larsson
24a27ba44f gl renderer: Fix up texture cache key 
The commit e14d2be1 forgot to actually set the parent_rect in the texture
key in the case it is necessary.
 2020-10-05 15:43:04 +02:00
Matthias Clasen
dc3b140fd7 Cosmetics 2020-10-01 13:48:24 -04:00