archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
2a2261d7e1933a1f5cfe478dbf109888c91697e8
blender-archive/source/blender/gpu/intern/gpu_shader_builtin.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

444 lines
16 KiB
C
Raw Normal View History

File headers: SPDX License migration Use a shorter/simpler license convention, stops the header taking so much space. Follow the SPDX license specification: https://spdx.org/licenses - C/C++/objc/objc++ - Python - Shell Scripts - CMake, GNUmakefile While most of the source tree has been included - `./extern/` was left out. - `./intern/cycles` & `./intern/atomic` are also excluded because they use different header conventions. doc/license/SPDX-license-identifiers.txt has been added to list SPDX all used identifiers. See P2788 for the script that automated these edits. Reviewed By: brecht, mont29, sergey Ref D14069
2022-02-11 09:07:11 +11:00
/* SPDX-License-Identifier: GPL-2.0-or-later
* Copyright 2005 Blender Foundation. All rights reserved. */
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup gpu
Cleanup: add file doxy comments
2018-08-30 01:56:08 +10:00
*/
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
#include "MEM_guardedalloc.h"
#include "BLI_math_base.h"
#include "BLI_math_vector.h"
--debug-gpu-shader: Dump GLSL shaders to disk This is really convenient for development. Either for profiling the generated shaders or to check if the generated code is correct. It writes the shaders to the temporary blender session folder.
2017-09-27 18:03:00 +02:00
#include "BLI_path_util.h"
GPUShader: Add name for debugging & identifying shaders.
2018-08-02 18:31:38 +02:00
#include "BLI_string.h"
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
#include "BLI_string_utils.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BLI_utildefines.h"
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
--debug-gpu-shader: Dump GLSL shaders to disk This is really convenient for development. Either for profiling the generated shaders or to check if the generated code is correct. It writes the shaders to the temporary blender session folder.
2017-09-27 18:03:00 +02:00
#include "BKE_appdir.h"
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
#include "BKE_global.h"
--debug-gpu-shader: Dump GLSL shaders to disk This is really convenient for development. Either for profiling the generated shaders or to check if the generated code is correct. It writes the shaders to the temporary blender session folder.
2017-09-27 18:03:00 +02:00
#include "DNA_space_types.h"
Merge remote-tracking branch 'origin/master' into blender2.8
2017-04-18 16:30:13 +02:00
#include "GPU_matrix.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "GPU_platform.h"
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
#include "GPU_shader.h"
#include "GPU_texture.h"
GPUUniformBuf: Rename struct and change API a bit This follows the GPU module naming of other buffers. We pass name to distinguish each GPUUniformBuf in debug mode. Also remove DRW_uniform_buffer interface.
2020-08-20 23:09:37 +02:00
#include "GPU_uniform_buffer.h"
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
shrink fixed-size internal GLSL string buffers We concatenate #defines and #extensions into these, and can count the max string lengths needed. 256 is enough to hold today's strings; we can adjust later if needed.
2017-04-07 13:28:42 -04:00
/* Adjust these constants as needed. */
#define MAX_DEFINE_LENGTH 256
EEVEE: Replace octahedron reflection probe by cubemap array We implement cubemap array support for EEVEE's lightcache reflection probes. This removes stretched texels and bottom hemisphere seams artifacts caused by the octahedral projection previously used. This introduce versioning code for the lightcache which will discard any lightcache version that is not compatible. Differential Revision: https://developer.blender.org/D7066
2020-03-11 17:12:01 +01:00
#define MAX_EXT_DEFINE_LENGTH 512
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
/* Non-generated shaders */
OpenGL: add built-in GPU_SHADER_3D_DEPTH_ONLY We’re discussing several techniques that require a depth pre-pass.
2016-09-13 02:51:38 -04:00
extern char datatoc_gpu_shader_depth_only_frag_glsl[];
OpenGL: shaders for simple 3D drawing These are intended for very simple drawing. No lighting etc. Shares some fragment code with the 2D shaders. Similar to their 2D counterparts, but are not combined because of future plans for separate 2D & 3D matrix stacks.
2016-08-16 14:58:53 -04:00
extern char datatoc_gpu_shader_uniform_color_frag_glsl[];
OpenGL immediate mode: interface_draw.c (cont) ui_draw_but_COLORBAND Introduced a new checker shader to be used mostly on transparent areas. OpenGL immediate mode: interface_draw.c (cont) ui_draw_but_UNITVEC Introduced a new shader to be used for simple lighting.
2017-02-07 13:04:08 +01:00
extern char datatoc_gpu_shader_checker_frag_glsl[];
Add diagonal stripe shader (GPU_SHADER_2D_DIAG_STRIPES) Reviewed By: merwin Differential Revision: https://developer.blender.org/D2512
2017-02-16 21:49:20 -02:00
extern char datatoc_gpu_shader_diag_stripes_frag_glsl[];
OpenGL immediate mode: interface_draw.c (cont) ui_draw_but_COLORBAND Introduced a new checker shader to be used mostly on transparent areas. OpenGL immediate mode: interface_draw.c (cont) ui_draw_but_UNITVEC Introduced a new shader to be used for simple lighting.
2017-02-07 13:04:08 +01:00
extern char datatoc_gpu_shader_simple_lighting_frag_glsl[];
OpenGL: shaders for simple 3D drawing These are intended for very simple drawing. No lighting etc. Shares some fragment code with the 2D shaders. Similar to their 2D counterparts, but are not combined because of future plans for separate 2D & 3D matrix stacks.
2016-08-16 14:58:53 -04:00
extern char datatoc_gpu_shader_flat_color_frag_glsl[];
OpenGL: edge shader discards fragments of unused edges Discarded edges should not update depth buffer or blend with color buffer. Geometry shader version will make this obsolete.
2016-10-26 03:57:14 -04:00
extern char datatoc_gpu_shader_flat_color_alpha_test_0_frag_glsl[];
GPU: Add GPU_SHADER_INSTANCE_VARIYING_ID_VARIYING_SIZE. Will be used for probe outline id drawing.
2018-04-17 13:00:09 +02:00
extern char datatoc_gpu_shader_flat_id_frag_glsl[];
UI: Optimize the area border drawing It is was not really a bottleneck but it was triggering my OCD when 1/3rd of the drawcalls in a normal scene were basically only caused by this.
2018-08-23 22:29:29 +02:00
extern char datatoc_gpu_shader_2D_area_borders_vert_glsl[];
UI: Simplify the area border drawing Instead of doing a lot of alpha blended drawing with jittering, use the fragment shader to do the masking using a circle mask. This is much simpler and requires much less resources. Hopefully this may solve the issue we have with the Intels UHD Graphics 620 on linux.
2018-12-01 19:49:31 +01:00
extern char datatoc_gpu_shader_2D_area_borders_frag_glsl[];
OpenGL: new built-in point shader, clean up other shader names Smooth round point with outline (uniform color) and fill (varying color). Updated shader naming scheme: a shader that doesn't deal with color does not have to say "no color". Vertex shaders do not have to say "uniform color" since their frag counterpart actually has the uniform. Each name should describe what that shader *does*, not what it *doesn't do*.
2016-10-15 02:30:59 -04:00
extern char datatoc_gpu_shader_2D_vert_glsl[];
OpenGL: simple 2D shader with flat color Flat color means each primitive will use color from the provoking vertex.
2016-08-08 04:56:02 -04:00
extern char datatoc_gpu_shader_2D_flat_color_vert_glsl[];
UI: Support for runtime geometry icons
2018-04-20 15:15:10 +02:00
extern char datatoc_gpu_shader_2D_smooth_color_uniform_alpha_vert_glsl[];
OpenGL: add simple shaders for 2D drawing The first two of several new simple built-in shaders (will test these before adding more). These are intended for the new immediate mode API, but you can use them just like any built-in GPUShader. Due to limitations on different platforms, shaders need to work with GLSL versions 120, 130 and 150. Final Blender 2.8 will be pure #version 150.
2016-08-04 15:59:38 -04:00
extern char datatoc_gpu_shader_2D_smooth_color_vert_glsl[];
extern char datatoc_gpu_shader_2D_smooth_color_frag_glsl[];
convert icon_draw_texture to gawain imm mode replacements
2016-11-18 16:04:25 +01:00
extern char datatoc_gpu_shader_2D_image_vert_glsl[];
UI: Perf: Make icon_draw_texture use GWN_draw_primitive. This bypass the use of immediate mode for theses drawcalls. Placement and and icon select (via uvs) is done inside the vertex shader.
2018-03-27 23:57:29 +02:00
extern char datatoc_gpu_shader_2D_image_rect_vert_glsl[];
UI: Perf: Batch icons drawcalls together. For this we use a new shader that gets it's data from a uniform array. Vertex shader position the vertices using these data. Using glUniform is way faster than using imm for that matter. Like BLF rendering, UI icons are always (as far as I know) non occluded and displayed above everything else. They also does not overlap with texts so they can be batched at the same time.
2018-03-31 19:32:28 +02:00
extern char datatoc_gpu_shader_2D_image_multi_rect_vert_glsl[];
GPUShader: Add specialized widget base shader. This vertex shader let us draw widgets with batches instead of imm calls.
2018-03-29 03:06:33 +02:00
extern char datatoc_gpu_shader_2D_widget_base_vert_glsl[];
UI: Perf: Port color widgets to batch. This is more for completeness than perf. Shader is tiny bit more complex but we get less overdraw and drawcalls.
2018-04-06 23:54:24 +02:00
extern char datatoc_gpu_shader_2D_widget_base_frag_glsl[];
UI: Perf: Improve ui_draw_dropshadow. Replace the 12 iterations of UI_draw_roundbox_4fv with only one batch. This mean less overdraw and less drawcalls. I had to hack the opacity falloff curve manually to get approximatly the same result as previous technique. I'm sure with a bit more brain power somebody could find the perfect function.
2018-04-06 10:09:23 +02:00
extern char datatoc_gpu_shader_2D_widget_shadow_vert_glsl[];
extern char datatoc_gpu_shader_2D_widget_shadow_frag_glsl[];
GPUShader: Add 2D Nodelink shader. Special shader to draw nodelinks for the node editor. We only pass bezier points to the GPU and vertex position is handled inside the vertex shader. The arrow is also part of the batch to avoid separate drawcalls for it. We still draw 2 pass one for shadow and one for the link color on top. One variation to draw instances of theses links so that we only do one drawcall.
2018-04-05 15:27:53 +02:00
extern char datatoc_gpu_shader_2D_nodelink_frag_glsl[];
extern char datatoc_gpu_shader_2D_nodelink_vert_glsl[];
convert icon_draw_texture to gawain imm mode replacements
2016-11-18 16:04:25 +01:00
OpenGL: tweak image shaders & code that uses them - rename image shaders to describe exactly what they do - rename inputs to match other built-in shaders - set & use active texture unit - no need to enable/disable textures with GLSL - pull vertex format setup out of loops
2016-10-18 00:08:34 -04:00
extern char datatoc_gpu_shader_3D_image_vert_glsl[];
Code cleanup: stop using rectangle textures in window draw, simplify code.
2018-02-13 18:09:58 +01:00
extern char datatoc_gpu_shader_image_frag_glsl[];
DRW: Color Management improvement Reviewed By: brecht sergey jbakker Differential Revision: http://developer.blender.org/D6729
2020-02-11 15:18:55 +01:00
extern char datatoc_gpu_shader_image_overlays_merge_frag_glsl[];
Fix T73931: Stereo Viewport Color Management Stereoscopic viewport didn't support Color Manangement due recent changes in the color management pipeline. In order to solve the issue we will migrate the strereo rendering into the GPUViewport. This will share some textures and reduce required GPU memory. Reviewed By: fclem, dfelinto Differential Revision: https://developer.blender.org/D6922
2020-03-19 08:06:49 +01:00
extern char datatoc_gpu_shader_image_overlays_stereo_merge_frag_glsl[];
convert icon_draw_texture to gawain imm mode replacements
2016-11-18 16:04:25 +01:00
extern char datatoc_gpu_shader_image_color_frag_glsl[];
UI: desaturate toolbar icons that the mouse is not over. This does not look great with light toolbar buttons as in the default, so consider this a work in progress.
2018-04-26 15:42:08 +02:00
extern char datatoc_gpu_shader_image_desaturate_frag_glsl[];
Fix T92807: Incorrect display planar tracking. Issue introduced in {7e66616b7e15} where the shader was replaced with a 2d image shader. This patch reverts several commits that removed the 3d image shader.
2021-11-05 14:51:55 +01:00
extern char datatoc_gpu_shader_image_modulate_alpha_frag_glsl[];
UI: Perf: Batch icons drawcalls together. For this we use a new shader that gets it's data from a uniform array. Vertex shader position the vertices using these data. Using glUniform is way faster than using imm for that matter. Like BLF rendering, UI icons are always (as far as I know) non occluded and displayed above everything else. They also does not overlap with texts so they can be batched at the same time.
2018-03-31 19:32:28 +02:00
extern char datatoc_gpu_shader_image_varying_color_frag_glsl[];
OpenGL immediate mode: new shader image shuffle color new shader to draw an image with one isolated channel
2017-02-24 01:07:40 +01:00
extern char datatoc_gpu_shader_image_shuffle_color_frag_glsl[];
OpenGL: new built-in point shader, clean up other shader names Smooth round point with outline (uniform color) and fill (varying color). Updated shader naming scheme: a shader that doesn't deal with color does not have to say "no color". Vertex shaders do not have to say "uniform color" since their frag counterpart actually has the uniform. Each name should describe what that shader *does*, not what it *doesn't do*.
2016-10-15 02:30:59 -04:00
extern char datatoc_gpu_shader_3D_vert_glsl[];
OpenGL: fix GPU_SHADER_SIMPLE_LIGHTING_SMOOTH_COLOR The fragment shader expects a normal, but the vertex shader was not providing one. Fix: added a new vertex shader that has normals + smooth color interpolation. I also split gpu_shader_3D_vert in two: - one with just position - one with position + normal For each of the builtin shaders, we should be able to look at the GLSL and tell exactly what it's doing. Using #defines and #ifdefs for rendering options makes the shaders hard to read and easy to break.
2017-04-16 15:04:07 -04:00
extern char datatoc_gpu_shader_3D_normal_vert_glsl[];
OpenGL: shaders for simple 3D drawing These are intended for very simple drawing. No lighting etc. Shares some fragment code with the 2D shaders. Similar to their 2D counterparts, but are not combined because of future plans for separate 2D & 3D matrix stacks.
2016-08-16 14:58:53 -04:00
extern char datatoc_gpu_shader_3D_flat_color_vert_glsl[];
GPU: Add Polyline shader (wide line emulation) This new shader is able to emulate smooth wide lines drawing using a geometry shader. This shader needs viewportSize and lineWidth uniforms to be set. There is multiple variants to replace the usage of wide lines for most shaders. This patch only fix the gizmo_types files and the navigation gizmo. Other areas could be fixed afterward, I just limited the patch size. Fix T57570. Reviewed By: billreynish Differential Revision: https://developer.blender.org/D7487
2020-04-23 23:05:39 +02:00
extern char datatoc_gpu_shader_3D_polyline_frag_glsl[];
extern char datatoc_gpu_shader_3D_polyline_geom_glsl[];
extern char datatoc_gpu_shader_3D_polyline_vert_glsl[];
OpenGL: shaders for simple 3D drawing These are intended for very simple drawing. No lighting etc. Shares some fragment code with the 2D shaders. Similar to their 2D counterparts, but are not combined because of future plans for separate 2D & 3D matrix stacks.
2016-08-16 14:58:53 -04:00
extern char datatoc_gpu_shader_3D_smooth_color_vert_glsl[];
extern char datatoc_gpu_shader_3D_smooth_color_frag_glsl[];
GPU shaders / Clay engine : small renaming / cleanup
2017-02-11 21:15:46 +01:00
extern char datatoc_gpu_shader_3D_passthrough_vert_glsl[];
Fix rotation manipulators not clipping Added new shader for clipping, also cleaned up rotation manipulator drawing code a bit. This code should be replaced by new transform manipulators soon, just keeping this working in the meanwhile.
2017-04-05 01:28:48 +02:00
extern char datatoc_gpu_shader_3D_clipped_uniform_color_vert_glsl[];
OpenGL: add simple shaders for 2D drawing The first two of several new simple built-in shaders (will test these before adding more). These are intended for the new immediate mode API, but you can use them just like any built-in GPUShader. Due to limitations on different platforms, shaders need to work with GLSL versions 120, 130 and 150. Final Blender 2.8 will be pure #version 150.
2016-08-04 15:59:38 -04:00
Clay Engine: converted Empties to the new instancing method
2017-02-09 20:55:31 +01:00
extern char datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl[];
Clay-Engine (merge clay-engine) Initial work by Clément Foucault with contributions from Dalai Felinto (mainly per-collection engine settings logic, and depsgraph iterator placeholder). This makes Blender require OpenGL 3.3. Which means Intel graphic card and OSX will break. Disable CLAY_ENGINE in CMake in those cases. This is a prototype render engine intended to help the design of real render engines. This is mainly an engine with enphasis in matcap and ambient occlusion. Implemented Features -------------------- * Clay Render Engine, following the new API, to be used as reference for future engines * A more complete Matcap customization with more options * Per-Collection render engine settings * New Ground Truth AO - not enabled Missing Features ---------------- * Finish object edit mode - Fix shaders to use new matrix - Fix artifacts when edge does off screen - Fix depth issue - Selection sillhouette - Mesh wires - Use mesh normals (for higher quality matcap) - Non-Mesh objects drawing - Widget drawing - Performance issues * Finish mesh edit mode - Derived-Mesh-less edit mode API (mesh_rende.c) * General edit mode - Per-collection edit mode settings * General engines - Per-collection engine settings (they are their, but they still need to be flushed by depsgraph, and used by the drawing code)
2017-02-07 11:20:15 +01:00
rename built-in point shaders, SMOOTH --> AA Updated shader names and code that uses them. All of these shaders produce round points that are anti-aliased and blended against the background. These were initially named SMOOTH because they replace glEnable(GL_POINT_SMOOTH). But SMOOTH in shader-land refers to vertex attribute interpolation (like glShadeModel(GL_SMOOTH)). Using SMOOTH to mean two things is confusing, so we now use AA to mean "the point is anti-aliased".
2017-02-28 02:18:52 -05:00
extern char datatoc_gpu_shader_point_uniform_color_aa_frag_glsl[];
extern char datatoc_gpu_shader_point_uniform_color_outline_aa_frag_glsl[];
Edit UVs: Refactor drawing Edit UV in Image Editor NOTE: This commit only concern edit UVs and not the "shadow" mesh displayed when texture painting. This will be address in a future commit. We now cache the uv mesh in the mesh batch cache and only reupload data on changes. Update could be more granular (and a bit faster) but it's not our main concern ATM. This should fix problem caused by the IMM api used to draw large meshes. This makes performance skyrocket compared to previous implementation. There is still a big CPU bottleneck when not in sync selection mode but it is not related to the drawing function directly.
2018-09-29 19:42:09 +02:00
extern char datatoc_gpu_shader_point_varying_color_varying_outline_aa_frag_glsl[];
OpenGL: new built-in shaders for drawing points Both of these draw round points with jaggy edges, but treat color & size differently.
2016-09-30 20:44:22 -04:00
extern char datatoc_gpu_shader_point_varying_color_frag_glsl[];
extern char datatoc_gpu_shader_3D_point_fixed_size_varying_color_vert_glsl[];
OpenGL: one more point shader Added a built-in shader for points that vary both size and color.
2016-10-01 17:32:29 -04:00
extern char datatoc_gpu_shader_3D_point_varying_size_varying_color_vert_glsl[];
rename built-in point shaders, SMOOTH --> AA Updated shader names and code that uses them. All of these shaders produce round points that are anti-aliased and blended against the background. These were initially named SMOOTH because they replace glEnable(GL_POINT_SMOOTH). But SMOOTH in shader-land refers to vertex attribute interpolation (like glShadeModel(GL_SMOOTH)). Using SMOOTH to mean two things is confusing, so we now use AA to mean "the point is anti-aliased".
2017-02-28 02:18:52 -05:00
extern char datatoc_gpu_shader_3D_point_uniform_size_aa_vert_glsl[];
extern char datatoc_gpu_shader_2D_point_uniform_size_aa_vert_glsl[];
extern char datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl[];
OpenGL: new built-in shaders for drawing points Both of these draw round points with jaggy edges, but treat color & size differently.
2016-09-30 20:44:22 -04:00
Cleanup/rename etc. dashed line shaders. Goal is to make them more modular, to allow more variants (variable single-color, thickness, ...) to be added without having to copy-and-change-one-line of whole chain of shaders.
2017-07-13 16:44:02 +02:00
extern char datatoc_gpu_shader_2D_line_dashed_uniform_color_vert_glsl[];
OpenGL: wm_gesture uses new imm mode D2376 by @ianwill, part of T49043 review by @merwin Box select, circle select, etc. Introducing the dashed-line shader! See D2376 for more info.
2017-02-24 15:33:09 -05:00
extern char datatoc_gpu_shader_2D_line_dashed_frag_glsl[];
Cleanup/rename etc. dashed line shaders. Goal is to make them more modular, to allow more variants (variable single-color, thickness, ...) to be added without having to copy-and-change-one-line of whole chain of shaders.
2017-07-13 16:44:02 +02:00
extern char datatoc_gpu_shader_3D_line_dashed_uniform_color_vert_glsl[];
OpenGL: wm_gesture uses new imm mode D2376 by @ianwill, part of T49043 review by @merwin Box select, circle select, etc. Introducing the dashed-line shader! See D2376 for more info.
2017-02-24 15:33:09 -05:00
add GPU_SHADER_TEXT for font rendering With USE_GLSL enabled, GPU_basic_shader(TEXTURE|COLOR) always rendered black. New shader uses a solid color + alpha channel of texture (which in our case is a font glyph). See fragment shader for details. I prefer this approah -- multiple shaders that each do one thing well (and are easy to read/write/understand), instead of one shader that can do many things given the right options.
2016-09-17 13:33:02 +02:00
extern char datatoc_gpu_shader_text_vert_glsl[];
extern char datatoc_gpu_shader_text_frag_glsl[];
Cleanup: Remove hardcoded values and rename keyframe shape shaders No functional change. The shader is complicated by itself, having hardcoded values makes it even more cryptic. I also renamed the shader because the shader is not for the keyfarme diamond only, but for all the keyframe shapes. Differential Revision: https://developer.blender.org/D12615
2021-09-23 15:53:38 +02:00
extern char datatoc_gpu_shader_keyframe_shape_vert_glsl[];
extern char datatoc_gpu_shader_keyframe_shape_frag_glsl[];
add GPU_SHADER_TEXT for font rendering With USE_GLSL enabled, GPU_basic_shader(TEXTURE|COLOR) always rendered black. New shader uses a solid color + alpha channel of texture (which in our case is a font glyph). See fragment shader for details. I prefer this approah -- multiple shaders that each do one thing well (and are easy to read/write/understand), instead of one shader that can do many things given the right options.
2016-09-17 13:33:02 +02:00
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
extern char datatoc_gpu_shader_gpencil_stroke_vert_glsl[];
extern char datatoc_gpu_shader_gpencil_stroke_frag_glsl[];
extern char datatoc_gpu_shader_gpencil_stroke_geom_glsl[];
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
extern char datatoc_gpu_shader_cfg_world_clip_lib_glsl[];
New Grease Pencil object for 2D animation This commit merge the full development done in greasepencil-object branch and include mainly the following features. - New grease pencil object. - New drawing engine. - New grease pencil modes Draw/Sculpt/Edit and Weight Paint. - New brushes for grease pencil. - New modifiers for grease pencil. - New shaders FX. - New material system (replace old palettes and colors). - Split of annotations (old grease pencil) and new grease pencil object. - UI adapted to blender 2.8. You can get more info here: https://code.blender.org/2017/12/drawing-2d-animation-in-blender-2-8/ https://code.blender.org/2018/07/grease-pencil-status-update/ This is the result of nearly two years of development and I want thanks firstly the other members of the grease pencil team: Daniel M. Lara, Matias Mendiola and Joshua Leung for their support, ideas and to keep working in the project all the time, without them this project had been impossible. Also, I want thanks other Blender developers for their help, advices and to be there always to help me, and specially to Clément Foucault, Dalai Felinto, Pablo Vázquez and Campbell Barton.
2018-07-31 10:22:19 +02:00
GPUShader: Implement workaround for gizmo drawing on sRGB framebuffer This solution involves adding a uniform to each fragment shader that is used by gizmo drawing and use the framebuffer state to set this uniform accordingly. This solution can also be carried to external shaders (addons). A single line of code would then be enough to fix the issue. The only trickery here is the dummy define: `#define srgb_to_framebuffer_space(a)` This is in order to avoid breaking other DRW shaders that use the same fragment shader code but do not need the tranformation. Related to T74139 Reviewed By: brecht, campbellbarton Differential Revision: https://developer.blender.org/D7261
2020-04-14 20:44:45 +02:00
extern char datatoc_gpu_shader_colorspace_lib_glsl[];
Cleanup: move clipping shader lib & define into struct Also compare clipping with the draw context instead of accessing the RegionView3D, currently they're matching but this might not always be the case.
2019-02-10 11:06:22 +11:00
const struct GPUShaderConfigData GPU_shader_cfg_data[GPU_SHADER_CFG_LEN] = {
[GPU_SHADER_CFG_DEFAULT] =
{
.lib = "",
GPUShader: Implement workaround for gizmo drawing on sRGB framebuffer This solution involves adding a uniform to each fragment shader that is used by gizmo drawing and use the framebuffer state to set this uniform accordingly. This solution can also be carried to external shaders (addons). A single line of code would then be enough to fix the issue. The only trickery here is the dummy define: `#define srgb_to_framebuffer_space(a)` This is in order to avoid breaking other DRW shaders that use the same fragment shader code but do not need the tranformation. Related to T74139 Reviewed By: brecht, campbellbarton Differential Revision: https://developer.blender.org/D7261
2020-04-14 20:44:45 +02:00
.def = "#define blender_srgb_to_framebuffer_space(a) a\n",
Cleanup: move clipping shader lib & define into struct Also compare clipping with the draw context instead of accessing the RegionView3D, currently they're matching but this might not always be the case.
2019-02-10 11:06:22 +11:00
},
[GPU_SHADER_CFG_CLIPPED] =
{
.lib = datatoc_gpu_shader_cfg_world_clip_lib_glsl,
GPUShader: Implement workaround for gizmo drawing on sRGB framebuffer This solution involves adding a uniform to each fragment shader that is used by gizmo drawing and use the framebuffer state to set this uniform accordingly. This solution can also be carried to external shaders (addons). A single line of code would then be enough to fix the issue. The only trickery here is the dummy define: `#define srgb_to_framebuffer_space(a)` This is in order to avoid breaking other DRW shaders that use the same fragment shader code but do not need the tranformation. Related to T74139 Reviewed By: brecht, campbellbarton Differential Revision: https://developer.blender.org/D7261
2020-04-14 20:44:45 +02:00
.def = "#define USE_WORLD_CLIP_PLANES\n"
"#define blender_srgb_to_framebuffer_space(a) a\n",
Cleanup: move clipping shader lib & define into struct Also compare clipping with the draw context instead of accessing the RegionView3D, currently they're matching but this might not always be the case.
2019-02-10 11:06:22 +11:00
},
};
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
/* cache of built-in shaders (each is created on first use) */
Cleanup: fix compiler warnings.
2019-03-16 19:48:28 +01:00
static GPUShader *builtin_shaders[GPU_SHADER_CFG_LEN][GPU_SHADER_BUILTIN_LEN] = {{NULL}};
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
typedef struct {
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
const char *name;
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
const char *vert;
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
/** Optional. */
const char *geom;
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
const char *frag;
GPU: refactor defines into GPUShaderStages Code comment notes there are "just a few", now there are enough it's useful to include in GPUShaderStages.
2019-01-26 10:04:10 +11:00
/** Optional. */
const char *defs;
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
const char *create_info;
const char *clipped_create_info;
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
} GPUShaderStages;
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_TEXT] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_TEXT",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_text",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
Cleanup: Remove hardcoded values and rename keyframe shape shaders No functional change. The shader is complicated by itself, having hardcoded values makes it even more cryptic. I also renamed the shader because the shader is not for the keyfarme diamond only, but for all the keyframe shapes. Differential Revision: https://developer.blender.org/D12615
2021-09-23 15:53:38 +02:00
[GPU_SHADER_KEYFRAME_SHAPE] =
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
{
Cleanup: Remove hardcoded values and rename keyframe shape shaders No functional change. The shader is complicated by itself, having hardcoded values makes it even more cryptic. I also renamed the shader because the shader is not for the keyfarme diamond only, but for all the keyframe shapes. Differential Revision: https://developer.blender.org/D12615
2021-09-23 15:53:38 +02:00
.name = "GPU_SHADER_KEYFRAME_SHAPE",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_keyframe_shape",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
[GPU_SHADER_SIMPLE_LIGHTING] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_SIMPLE_LIGHTING",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_simple_lighting",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
Fix T92807: Incorrect display planar tracking. Issue introduced in {7e66616b7e15} where the shader was replaced with a 2d image shader. This patch reverts several commits that removed the 3d image shader.
2021-11-05 14:51:55 +01:00
[GPU_SHADER_3D_IMAGE_MODULATE_ALPHA] =
{
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.name = "GPU_SHADER_3D_IMAGE_MODULATE_ALPHA",
.create_info = "gpu_shader_3D_image_modulate_alpha",
Fix T92807: Incorrect display planar tracking. Issue introduced in {7e66616b7e15} where the shader was replaced with a 2d image shader. This patch reverts several commits that removed the 3d image shader.
2021-11-05 14:51:55 +01:00
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_2D_CHECKER] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_2D_CHECKER",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_2D_checker",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_2D_DIAG_STRIPES] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_2D_DIAG_STRIPES",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_2D_diag_stripes",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
[GPU_SHADER_2D_UNIFORM_COLOR] =
{
.name = "GPU_SHADER_2D_UNIFORM_COLOR",
.create_info = "gpu_shader_2D_uniform_color",
},
[GPU_SHADER_2D_FLAT_COLOR] =
{
.name = "GPU_SHADER_2D_FLAT_COLOR",
.create_info = "gpu_shader_2D_flat_color",
},
[GPU_SHADER_2D_SMOOTH_COLOR] =
{
.name = "GPU_SHADER_2D_SMOOTH_COLOR",
.create_info = "gpu_shader_2D_smooth_color",
},
GPU: Disable create info for 2d image overlay merge. This shader needs to use the same interface as the OCIO shader. On Linux and Windows this seems to be the case. On MacOS however there is a mismatch that makes the overlay texture to be completely black when switching to workbench in the Shader workspace. This is just a temporarily work-around as this should be solved. Due to the poor GPU debugging facilities on Mac we haven't been able to pin-point the root cause.
2022-01-21 14:24:30 +01:00
[GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] =
{
.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
.create_info = "gpu_shader_2D_image_overlays_merge",
},
Fix T73931: Stereo Viewport Color Management Stereoscopic viewport didn't support Color Manangement due recent changes in the color management pipeline. In order to solve the issue we will migrate the strereo rendering into the GPUViewport. This will share some textures and reduce required GPU memory. Reviewed By: fclem, dfelinto Differential Revision: https://developer.blender.org/D6922
2020-03-19 08:06:49 +01:00
[GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
.create_info = "gpu_shader_2D_image_overlays_stereo_merge",
},
[GPU_SHADER_2D_IMAGE] =
{
.name = "GPU_SHADER_2D_IMAGE",
.create_info = "gpu_shader_2D_image",
},
[GPU_SHADER_2D_IMAGE_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_COLOR",
.create_info = "gpu_shader_2D_image_color",
},
[GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
.create_info = "gpu_shader_2D_image_desaturate_color",
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_2D_image_shuffle_color",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
[GPU_SHADER_2D_IMAGE_RECT_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
.create_info = "gpu_shader_2D_image_rect_color",
},
[GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR",
.create_info = "gpu_shader_2D_image_multi_rect_color",
},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_3D_UNIFORM_COLOR] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_3D_UNIFORM_COLOR",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_3D_uniform_color",
.clipped_create_info = "gpu_shader_3D_uniform_color_clipped",
},
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
[GPU_SHADER_3D_FLAT_COLOR] =
{
.name = "GPU_SHADER_3D_FLAT_COLOR",
.create_info = "gpu_shader_3D_flat_color",
.clipped_create_info = "gpu_shader_3D_flat_color_clipped",
},
[GPU_SHADER_3D_SMOOTH_COLOR] =
{
.name = "GPU_SHADER_3D_SMOOTH_COLOR",
.create_info = "gpu_shader_3D_smooth_color",
.clipped_create_info = "gpu_shader_3D_smooth_color_clipped",
},
[GPU_SHADER_3D_DEPTH_ONLY] =
{
.name = "GPU_SHADER_3D_DEPTH_ONLY",
.create_info = "gpu_shader_3D_depth_only",
.clipped_create_info = "gpu_shader_3D_depth_only_clipped",
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR",
GPUShader: Port 3D uniform color clipped shaders to use shaderCreateInfo This should have no functional changes.
2022-05-02 00:44:58 +02:00
.create_info = "gpu_shader_3D_clipped_uniform_color",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
[GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR] =
{
.name = "GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR",
.create_info = "gpu_shader_3D_polyline_uniform_color",
},
GPU: Add Polyline shader (wide line emulation) This new shader is able to emulate smooth wide lines drawing using a geometry shader. This shader needs viewportSize and lineWidth uniforms to be set. There is multiple variants to replace the usage of wide lines for most shaders. This patch only fix the gizmo_types files and the navigation gizmo. Other areas could be fixed afterward, I just limited the patch size. Fix T57570. Reviewed By: billreynish Differential Revision: https://developer.blender.org/D7487
2020-04-23 23:05:39 +02:00
[GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR",
.create_info = "gpu_shader_3D_polyline_uniform_color_clipped",
},
[GPU_SHADER_3D_POLYLINE_FLAT_COLOR] =
{
.name = "GPU_SHADER_3D_POLYLINE_FLAT_COLOR",
.create_info = "gpu_shader_3D_polyline_flat_color",
},
[GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR] =
{
.name = "GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR",
.create_info = "gpu_shader_3D_polyline_smooth_color",
},
[GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR] =
{
.name = "GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR",
.create_info = "gpu_shader_2D_line_dashed_uniform_color",
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR",
.create_info = "gpu_shader_3D_line_dashed_uniform_color",
.clipped_create_info = "gpu_shader_3D_line_dashed_uniform_color_clipped",
},
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_2D_point_uniform_size_uniform_color_aa",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
[GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA] =
{
GPUShader: Add meaningful debug names to builtin shaders This makes the debugging easier.
2020-09-16 01:40:04 +02:00
.name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA",
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
.create_info = "gpu_shader_2D_point_uniform_size_uniform_color_outline_aa",
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
},
[GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR",
.create_info = "gpu_shader_3D_point_fixed_size_varying_color",
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR",
.create_info = "gpu_shader_3D_point_varying_size_varying_color",
},
Cleanup: order GPUShaderStages (vert, geom, frag) Use names for declarations to support adding defines, coming next.
2019-01-26 09:46:29 +11:00
[GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] =
Cleanup: GPUShader: Make style consistent in builtin_shader_stages
2022-05-02 01:05:35 +02:00
{
.name = "GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA",
.create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa",
.clipped_create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa_clipped",
},
[GPU_SHADER_2D_AREA_BORDERS] =
{
.name = "GPU_SHADER_2D_AREA_BORDERS",
.create_info = "gpu_shader_2D_area_borders",
},
[GPU_SHADER_2D_WIDGET_BASE] =
{
.name = "GPU_SHADER_2D_WIDGET_BASE",
.create_info = "gpu_shader_2D_widget_base",
},
[GPU_SHADER_2D_WIDGET_BASE_INST] =
{
.name = "GPU_SHADER_2D_WIDGET_BASE_INST",
.defs = "#define USE_INSTANCE\n",
.create_info = "gpu_shader_2D_widget_base_inst",
},
[GPU_SHADER_2D_WIDGET_SHADOW] =
{
.name = "GPU_SHADER_2D_WIDGET_SHADOW",
.create_info = "gpu_shader_2D_widget_shadow",
},
[GPU_SHADER_2D_NODELINK] =
{
.name = "GPU_SHADER_2D_NODELINK",
.create_info = "gpu_shader_2D_nodelink",
},
[GPU_SHADER_2D_NODELINK_INST] =
{
.name = "GPU_SHADER_2D_NODELINK_INST",
.create_info = "gpu_shader_2D_nodelink_inst",
},
[GPU_SHADER_GPENCIL_STROKE] =
{
.name = "GPU_SHADER_GPENCIL_STROKE",
.create_info = "gpu_shader_gpencil_stroke",
},
GPU module: Initial implementation of the `gpu.shader` submodule. Differential Revision: https://developer.blender.org/D3688
2018-09-14 09:32:19 -03:00
};
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader,
Cleanup: use shorter name for shader config The struct name is descriptive, this isn't going to be confused with other variables.
2019-02-10 11:02:06 +11:00
eGPUShaderConfig sh_cfg)
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
{
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
BLI_assert(shader < GPU_SHADER_BUILTIN_LEN);
Cleanup: use shorter name for shader config The struct name is descriptive, this isn't going to be confused with other variables.
2019-02-10 11:02:06 +11:00
BLI_assert(sh_cfg < GPU_SHADER_CFG_LEN);
GPUShader **sh_p = &builtin_shaders[sh_cfg][shader];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
if (*sh_p == NULL) {
GPU: refactor defines into GPUShaderStages Code comment notes there are "just a few", now there are enough it's useful to include in GPUShaderStages.
2019-01-26 10:04:10 +11:00
const GPUShaderStages *stages = &builtin_shader_stages[shader];
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
/* common case */
Cleanup: use shorter name for shader config The struct name is descriptive, this isn't going to be confused with other variables.
2019-02-10 11:02:06 +11:00
if (sh_cfg == GPU_SHADER_CFG_DEFAULT) {
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
if (stages->create_info != NULL) {
GPU: Add GPU_shader_create_from_info_name This function will be used as the way to build shaders from create_infos. The previous used method was using a private function.
2022-01-25 14:22:44 +01:00
*sh_p = GPU_shader_create_from_info_name(stages->create_info);
Fix T97872: Annotation lines lost AA Since rB2a7a01b339ad, `lineSmooth` has lost its default value of true. So set the value when creating the shader. Differential Revision: https://developer.blender.org/D14876
2022-05-06 10:59:47 -03:00
if (ELEM(shader,
GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR,
GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR,
GPU_SHADER_3D_POLYLINE_FLAT_COLOR,
GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR)) {
/* Set a default value for `lineSmooth`.
* Ideally this value should be set by the caller. */
GPU_shader_bind(*sh_p);
GPU_shader_uniform_1i(*sh_p, "lineSmooth", 1);
}
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
}
else {
*sh_p = GPU_shader_create_from_arrays_named(
stages->name,
{
.vert = (const char *[]){stages->vert, NULL},
.geom = (const char *[]){stages->geom, NULL},
.frag =
(const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
.defs = (const char *[]){stages->defs, NULL},
});
}
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
}
Cleanup: use shorter name for shader config The struct name is descriptive, this isn't going to be confused with other variables.
2019-02-10 11:02:06 +11:00
else if (sh_cfg == GPU_SHADER_CFG_CLIPPED) {
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
/* Remove eventually, for now ensure support for each shader has been added. */
BLI_assert(ELEM(shader,
GPU_SHADER_3D_UNIFORM_COLOR,
GPU_SHADER_3D_SMOOTH_COLOR,
GPU_SHADER_3D_DEPTH_ONLY,
GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA,
3D View: Support light probe data clipping
2019-05-30 20:02:05 +10:00
GPU_SHADER_3D_FLAT_COLOR,
Overlay Engine: Refactor & Cleanup This is the unification of all overlays into one overlay engine as described in T65347. I went over all the code making it more future proof with less hacks and removing old / not relevent parts. Goals / Acheivements: - Remove internal shader usage (only drw shaders) - Remove viewportSize and viewportSizeInv and put them in gloabl ubo - Fixed some drawing issues: Missing probe option and Missing Alt+B clipping of some shader - Remove old (legacy) shaders dependancy (not using view UBO). - Less shader variation (less compilation time at first load and less patching needed for vulkan) - removed some geom shaders when I could - Remove static e_data (except shaders storage where it is OK) - Clear the way to fix some anoying limitations (dithered transparency, background image compositing etc...) - Wireframe drawing now uses the same batching capabilities as workbench & eevee (indirect drawing). - Reduced complexity, removed ~3000 Lines of code in draw (also removed a lot of unused shader in GPU). - Post AA to avoid complexity and cost of MSAA. Remaining issues: - ~~Armature edits, overlay toggles, (... others?) are not refreshing viewport after AA is complete~~ - FXAA is not the best for wires, maybe investigate SMAA - Maybe do something more temporally stable for AA. - ~~Paint overlays are not working with AA.~~ - ~~infront objects are difficult to select.~~ - ~~the infront wires sometimes goes through they solid counterpart (missing clear maybe?) (toggle overlays on-off when using infront+wireframe overlay in solid shading)~~ Note: I made some decision to change slightly the appearance of some objects to simplify their drawing. Namely the empty arrows end (which is now hollow/wire) and distance points of the cameras/spots being done by lines. Reviewed By: jbakker Differential Revision: https://developer.blender.org/D6296
2019-12-02 01:40:58 +01:00
GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR));
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
/* In rare cases geometry shaders calculate clipping themselves. */
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
if (stages->clipped_create_info != NULL) {
GPU: Add GPU_shader_create_from_info_name This function will be used as the way to build shaders from create_infos. The previous used method was using a private function.
2022-01-25 14:22:44 +01:00
*sh_p = GPU_shader_create_from_info_name(stages->clipped_create_info);
Revert "Revert "GPUShaderCreateInfo for interface abstraction"" This reverts commit edee5a947b7ea3e1324aa334a22c7c9bbf47f5f7. Fixes compilation error (Missing file BLI_float2.hh)
2022-01-17 14:45:22 +01:00
}
else {
const char *world_clip_lib = datatoc_gpu_shader_cfg_world_clip_lib_glsl;
const char *world_clip_def = "#define USE_WORLD_CLIP_PLANES\n";
*sh_p = GPU_shader_create_from_arrays_named(
stages->name,
{
.vert = (const char *[]){world_clip_lib, stages->vert, NULL},
.geom = (const char *[]){stages->geom ? world_clip_lib : NULL, stages->geom, NULL},
.frag =
(const char *[]){datatoc_gpu_shader_colorspace_lib_glsl, stages->frag, NULL},
.defs = (const char *[]){world_clip_def, stages->defs, NULL},
});
}
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
}
else {
BLI_assert(0);
}
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
return *sh_p;
}
GPU: Move gpu_shader.c to C++ We split builtin shader support to its own file to avoid converting code (lack of designated initializer in C++) and to reduce file size.
2020-07-28 20:04:15 +02:00
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
GPUShader *GPU_shader_get_builtin_shader(eGPUBuiltinShader shader)
{
return GPU_shader_get_builtin_shader_with_config(shader, GPU_SHADER_CFG_DEFAULT);
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
}
void GPU_shader_free_builtin_shaders(void)
{
GPU: refactor clipped drawing from DRW into GPU Needed to fix T61196, supporting clipped back-buffer in the 3D view which is done outside the draw module. It was also inconvenient having DRW_shader_* versions of GPU_shader_* API calls. - Clipping distances are now supported as a shader configuration for builtin shaders. - Add shader config argument when accessing builtin shaders. - Move GPU_shader_create_from_arrays() from DRW to GPU.
2019-02-06 09:15:16 +11:00
for (int i = 0; i < GPU_SHADER_CFG_LEN; i++) {
for (int j = 0; j < GPU_SHADER_BUILTIN_LEN; j++) {
if (builtin_shaders[i][j]) {
GPU_shader_free(builtin_shaders[i][j]);
builtin_shaders[i][j] = NULL;
}
OpenGL: manage built-in shaders better As our library of built-in shaders grows, it's important to create, access, and discard them efficiently. Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode. Creation and discard are unified. Adding a new shader requires fewer steps. 365 lines shorter :D
2016-11-08 22:53:59 -06:00
}
OpenGL: new built-in shader for smooth round 3D points w/ outline
2016-10-16 18:43:24 -04:00
}
OpenGL: split off framebuffer, shader and texture code into separate files.
2015-12-06 21:20:19 +01:00
}
Copy Permalink