]>
git.tdb.fi Git - libs/gl.git/log
Mikko Rasa [Fri, 16 Apr 2021 19:27:54 +0000 (22:27 +0300)]
Refactor scene data preparation to its own class
The visibility flags of all collections are now considered, rather than
just those of the direct children of the scene collection.
Mikko Rasa [Thu, 15 Apr 2021 18:04:34 +0000 (21:04 +0300)]
Only show the mesh properties panel for meshes
Mikko Rasa [Thu, 15 Apr 2021 18:03:30 +0000 (21:03 +0300)]
Adjust scene export code
Resources are no longer exported as a collection by default. If
collection export is enabled, the scene itself is put in the collection
too.
Mikko Rasa [Thu, 15 Apr 2021 17:57:51 +0000 (20:57 +0300)]
Make Scenes loadable from collection files too
Mikko Rasa [Thu, 15 Apr 2021 17:44:27 +0000 (20:44 +0300)]
Rename visible_collections to visible_only
It was kinda confusing when there's also collection files.
Mikko Rasa [Thu, 15 Apr 2021 17:23:08 +0000 (20:23 +0300)]
Fix multiplication operators in camera exporter
Mikko Rasa [Thu, 15 Apr 2021 17:04:26 +0000 (20:04 +0300)]
Redesign object exporting
To combat operator bloat, all object-based data is now exported with a
common front-end class. SceneExporter also uses this to export its
resources.
Meshes can't be exported on their own anymore, only as part of objects.
But loose meshes aren't that useful anymore with the improvements in
defining materials and techniques in Blender.
Mikko Rasa [Thu, 15 Apr 2021 16:20:37 +0000 (19:20 +0300)]
Revise export function parameter orders
Mikko Rasa [Thu, 15 Apr 2021 13:23:47 +0000 (16:23 +0300)]
Remove some rarely-used export settings
Mikko Rasa [Wed, 14 Apr 2021 16:12:31 +0000 (19:12 +0300)]
Add generator ID for the SPIR-V compiler
Mikko Rasa [Wed, 14 Apr 2021 15:35:38 +0000 (18:35 +0300)]
Support loading sequences in the viewer
Mikko Rasa [Wed, 14 Apr 2021 15:28:04 +0000 (18:28 +0300)]
Use ObjectInstance instead of AnimatedObject in Scene loader
Since ObjectInstance has a matrix now, there's no need to use
AnimatedObject here. I may add another statement to include objects
with actual animations later.
Mikko Rasa [Wed, 14 Apr 2021 15:26:39 +0000 (18:26 +0300)]
Allow renderables to be specified in SequenceTemplate passes
Mikko Rasa [Wed, 14 Apr 2021 15:25:03 +0000 (18:25 +0300)]
Rename SequenceTemplate::Pass::renderable_name to slot_name
Mikko Rasa [Wed, 14 Apr 2021 15:09:36 +0000 (18:09 +0300)]
Avoid NaN issues in rare cases in the Cook-Torrance shader
The dot product may sometimes be very slightly over 1.0, making the
first argument to pow negative and giving undefined results.
Mikko Rasa [Wed, 14 Apr 2021 15:07:50 +0000 (18:07 +0300)]
Fix loading sRGB external images for textures
This fixes bugs introduced in
9087cc0 (sRGB state ignored when setting
internal format) and
635e5dc (external_image_srgb handled incorrectly).
Mikko Rasa [Wed, 14 Apr 2021 12:04:24 +0000 (15:04 +0300)]
Remove some vestigial code from Sequence
Apparently a few internal parts were left behind when I removed the
related interfaces.
Mikko Rasa [Wed, 14 Apr 2021 11:46:05 +0000 (14:46 +0300)]
Use a vector instead of a list for Sequence's steps
They're not large or numerous enough to warrant a list.
Mikko Rasa [Wed, 14 Apr 2021 11:45:15 +0000 (14:45 +0300)]
Add compatibility typedefs for the pipeline classes
Must be in a separate commit for git to pick up on the renames in the
previous one.
Mikko Rasa [Wed, 14 Apr 2021 11:42:11 +0000 (14:42 +0300)]
Rename Pipeline to Sequence
Pipeline::Pass is now Sequence::Step. These better match what the
classes do.
Mikko Rasa [Tue, 13 Apr 2021 21:26:24 +0000 (00:26 +0300)]
New way of loading scenes in the viewer
Mikko Rasa [Tue, 13 Apr 2021 21:04:13 +0000 (00:04 +0300)]
Add a scene type property to the Blender exporter
Mikko Rasa [Tue, 13 Apr 2021 21:03:43 +0000 (00:03 +0300)]
Support loading scenes from Resources
Mikko Rasa [Tue, 13 Apr 2021 20:53:43 +0000 (23:53 +0300)]
Add a registry-based generic loader to Scene
This is rather similar to the one in Material, but there's just enough
differences and template complications that it isn't trivial to abstract.
Mikko Rasa [Tue, 13 Apr 2021 19:17:01 +0000 (22:17 +0300)]
Use latest OpenGL version in viewer
Mikko Rasa [Tue, 13 Apr 2021 18:39:00 +0000 (21:39 +0300)]
Use an Options struct to process command line options in viewer
Mikko Rasa [Tue, 13 Apr 2021 11:07:58 +0000 (14:07 +0300)]
Improve logic for exporting material sampler references
Mikko Rasa [Tue, 13 Apr 2021 11:06:36 +0000 (14:06 +0300)]
Add an option to automatically detect if tangents need to be exported
It's enabled by default, which should reduce hassle when authoring
models.
Mikko Rasa [Tue, 13 Apr 2021 10:22:54 +0000 (13:22 +0300)]
Add the group and weight attributes to msp_interface.glsl
This got forgotten in
e1d0738 .
Mikko Rasa [Tue, 13 Apr 2021 10:22:02 +0000 (13:22 +0300)]
Include only tangent in mesh data and calculate binormal on the fly
This saves one vertex attribute.
Mikko Rasa [Tue, 13 Apr 2021 10:10:56 +0000 (13:10 +0300)]
Fix incorrect definition of the builtin cross function in GLSL
Mikko Rasa [Tue, 13 Apr 2021 09:43:56 +0000 (12:43 +0300)]
Use unit 0 UVs for exporting TBNs if no UV layer is specified
Mikko Rasa [Tue, 13 Apr 2021 09:02:24 +0000 (12:02 +0300)]
Ensure that objects have unique names while exporting a scene
Mikko Rasa [Tue, 13 Apr 2021 08:49:38 +0000 (11:49 +0300)]
Compare materials when looking for object clones while exporting a scene
Mikko Rasa [Tue, 13 Apr 2021 08:33:13 +0000 (11:33 +0300)]
Recognize a certain configuration of nodes as inverting Y for normals
Models made for DirectX treat the normal map values as having positive
Y pointing toward the bottom of the image, which is opposite to what my
engine and Blender expect. This allows fixing that without modifying
the original texture.
Mikko Rasa [Mon, 12 Apr 2021 22:27:00 +0000 (01:27 +0300)]
Force the usage of normalmap as RGB data
Mikko Rasa [Mon, 12 Apr 2021 22:25:22 +0000 (01:25 +0300)]
Use more efficient methods to manipulate and store texture data
Mikko Rasa [Mon, 12 Apr 2021 21:40:10 +0000 (00:40 +0300)]
Remove deprecated things from the maketex script
Mikko Rasa [Mon, 12 Apr 2021 21:18:07 +0000 (00:18 +0300)]
Fix a bug in makefont.py if no ranges are given
Mikko Rasa [Mon, 12 Apr 2021 21:17:23 +0000 (00:17 +0300)]
Convert the texture and font creation scripts to python3
Mikko Rasa [Mon, 12 Apr 2021 15:00:34 +0000 (18:00 +0300)]
Don't ignore structs entirely in UnusedVariableRemover
Structs may have arrays in them, and array sizes may have references to
specialization constants which must be kept.
Mikko Rasa [Mon, 12 Apr 2021 14:40:04 +0000 (17:40 +0300)]
Adjust specular calculation in the Phong shader
Since the look vector points towards the surface, it makes more sense
to calculate the reflected vector towards the light. The calculation
is symmetric so the result is the same.
Mikko Rasa [Mon, 12 Apr 2021 14:32:06 +0000 (17:32 +0300)]
Refactor vertex transformations in the common shader
It makes more sense to have virtual accessors for the transformation
matrices so the returned matrix can be used multiple times.
Mikko Rasa [Mon, 12 Apr 2021 12:38:54 +0000 (15:38 +0300)]
Rearrange type specification in material datafiles
The type is now specified as a separate statement with no substatements.
This is what I wanted to do originally but couldn't figure out a clean
way to do it.
No legacy support because the new material system as a whole is still
fairly new and hasn't been used in many places.
Mikko Rasa [Mon, 12 Apr 2021 12:01:48 +0000 (15:01 +0300)]
Migrate from LoadableTypeRegistry to TypeRegistry
Mikko Rasa [Mon, 12 Apr 2021 01:18:39 +0000 (04:18 +0300)]
Fix normal map property name in material exporter
Mikko Rasa [Mon, 12 Apr 2021 00:34:10 +0000 (03:34 +0300)]
Fix incorrect plurals in exporter scripts
Replacing "map" with "atlas" was not correct in the plural case
Mikko Rasa [Mon, 12 Apr 2021 00:33:37 +0000 (03:33 +0300)]
Fix refactoring errors in scene exporter
Mikko Rasa [Sun, 11 Apr 2021 20:39:16 +0000 (23:39 +0300)]
Recognize textures through an RGB to BW node in Blender
Mikko Rasa [Sun, 11 Apr 2021 20:38:31 +0000 (23:38 +0300)]
Deprecated InstanceScene and Renderable::get_instance_key
InstanceArray is a superior way of rendering multiple instances of an
object.
Mikko Rasa [Sun, 11 Apr 2021 20:35:26 +0000 (23:35 +0300)]
Redesign Text as an ObjectInstance
It's rare to need several copies of the same text, but positioning texts
is useful.
Text no longer copies the Technique but instead sets the texture in
setup_render.
Mikko Rasa [Sun, 11 Apr 2021 20:25:18 +0000 (23:25 +0300)]
Overhaul texture management in rendering classes
Textures are now set based on the uniform name (tag) rather than texture
unit. The Texturing class has been deprecated because it was making
things difficult when textures come from multiple sources, such as with
effects or decals. RenderPass and Renderer now handle multiple textures
directly.
There's some compatibility code but things are likely to break.
Mikko Rasa [Sat, 10 Apr 2021 20:07:19 +0000 (23:07 +0300)]
Use a vector for storage in DefaultUniformBlock
Uniform locations are normally spaced no more than 4 apart, so even with
a few empty spots a vector is going to be more efficient than a map.
Mikko Rasa [Sat, 10 Apr 2021 20:00:39 +0000 (23:00 +0300)]
Split UniformBlock into two classes
There's basically no overlap between default and buffer-backed blocks,
so no point in having them in the same class.
Mikko Rasa [Sat, 10 Apr 2021 18:42:58 +0000 (21:42 +0300)]
Refactor ProgramData to store blocks in vectors
Mikko Rasa [Sat, 10 Apr 2021 18:20:44 +0000 (21:20 +0300)]
Sort uniform blocks from SPIR-V modules
Mikko Rasa [Sat, 10 Apr 2021 18:17:00 +0000 (21:17 +0300)]
Use the new _member utility functions to search and sort things
Mikko Rasa [Sat, 10 Apr 2021 12:15:59 +0000 (15:15 +0300)]
Remove unnecessary std:: qualifiers from .cpp files
Mikko Rasa [Sat, 10 Apr 2021 12:04:26 +0000 (15:04 +0300)]
Use Tag to identify uniforms in Program and ProgramData
Setting uniforms is a common operation and this should be faster than
using strings.
Mikko Rasa [Sat, 10 Apr 2021 09:45:50 +0000 (12:45 +0300)]
Make Tags convertible back to the original string in debug builds
This helps in producing more readable error messages
Mikko Rasa [Sat, 10 Apr 2021 00:46:29 +0000 (03:46 +0300)]
Clear the empty name flag after emitting a member access
Mikko Rasa [Fri, 9 Apr 2021 21:40:39 +0000 (00:40 +0300)]
Pass Tag by value, not by reference
Since the tag object is small, it can be passed in a register.
Keeping a deprecated version would make it hard to tell which version
is being called.
Mikko Rasa [Fri, 9 Apr 2021 15:22:00 +0000 (18:22 +0300)]
Add an option to compile SPIR-V in the command-line GLSL compiler
Mikko Rasa [Fri, 9 Apr 2021 14:44:53 +0000 (17:44 +0300)]
Add a couple more test cases
Mikko Rasa [Fri, 9 Apr 2021 14:36:22 +0000 (17:36 +0300)]
Test the SPIR-V backend using libspirv
Mikko Rasa [Fri, 9 Apr 2021 14:31:47 +0000 (17:31 +0300)]
Add a SPIR-V backend to the GLSL compiler
Mikko Rasa [Fri, 9 Apr 2021 14:08:16 +0000 (17:08 +0300)]
Fix a signedness warning
Mikko Rasa [Fri, 9 Apr 2021 14:05:47 +0000 (17:05 +0300)]
Disallow specializing when compiling a module
The specialization constants would be ignored anyway, so better be
explicit about it.
Mikko Rasa [Fri, 9 Apr 2021 13:45:34 +0000 (16:45 +0300)]
Add an output file option to the command-line GLSL compiler
Mikko Rasa [Thu, 8 Apr 2021 21:52:06 +0000 (00:52 +0300)]
Visit the entire call graph in DependencyCollector
Mikko Rasa [Thu, 8 Apr 2021 21:46:53 +0000 (00:46 +0300)]
Convert operands of shift operators to the same vector size
Mikko Rasa [Wed, 7 Apr 2021 23:00:51 +0000 (02:00 +0300)]
Add a separate constant to enable clipping in standard shaders
Declaring an array with zero size is not allowed, so using zero for
max_clip_planes doesn't work.
Mikko Rasa [Wed, 7 Apr 2021 20:49:31 +0000 (23:49 +0300)]
Validate GLSL flow control
In particular, it's an error to reach the end of a non-void function
without a return statement.
Mikko Rasa [Wed, 7 Apr 2021 20:48:04 +0000 (23:48 +0300)]
Make the GLSL compiler test runner able to verify non-error diagnostics
Mikko Rasa [Wed, 7 Apr 2021 20:35:12 +0000 (23:35 +0300)]
Remove unreachable code after a jump statement
Mikko Rasa [Wed, 7 Apr 2021 12:28:24 +0000 (15:28 +0300)]
Check that non-constant data is not accessed from constant expressions
Mikko Rasa [Tue, 6 Apr 2021 23:02:40 +0000 (02:02 +0300)]
Compare array sizes in TypeComparer
Mikko Rasa [Tue, 6 Apr 2021 22:42:49 +0000 (01:42 +0300)]
Rewrite type comparisons as a visitor
Mikko Rasa [Tue, 6 Apr 2021 21:21:23 +0000 (00:21 +0300)]
Require conditions to be booleans
Mikko Rasa [Tue, 6 Apr 2021 21:17:02 +0000 (00:17 +0300)]
Disallow certain types from appearing on variables
Mikko Rasa [Tue, 6 Apr 2021 09:54:06 +0000 (12:54 +0300)]
Adjust GLSL builtins
Remove some functions which are complicated to implement in SPIR-V due
to the use of ad-hoc struct types or pointers. I may add them back
later if there turns out to be some use for them.
Add inline definitions for some overloads taking mixed vector and scalar
arguments. SPIR-V operations require all operands to have the same
number of elements. Builtin functions are always inlined even if used
more than once.
Mikko Rasa [Tue, 6 Apr 2021 09:48:44 +0000 (12:48 +0300)]
Leave no-op constructors as they are
In particular, don't break a matrix down into columns and construct
it again. These could just be removed from the AST entirely, but the
expression resolver currently does not do node replacement and it's
easier to just skip this in the backend.
Mikko Rasa [Tue, 6 Apr 2021 09:46:48 +0000 (12:46 +0300)]
Fix GLSL member access index calculation
Also show it in debug output
Mikko Rasa [Mon, 5 Apr 2021 13:54:49 +0000 (16:54 +0300)]
Refactor layout qualifier creation with constructors
Mikko Rasa [Mon, 5 Apr 2021 13:47:07 +0000 (16:47 +0300)]
Show label for all interface blocks in GLSL debug output
Mikko Rasa [Mon, 5 Apr 2021 13:46:11 +0000 (16:46 +0300)]
Track composite assignments and references in UnusedVariableRemover
Mikko Rasa [Mon, 5 Apr 2021 13:44:16 +0000 (16:44 +0300)]
Refactor add_to_chain as a common utility function
Mikko Rasa [Mon, 5 Apr 2021 12:59:36 +0000 (15:59 +0300)]
Mark all expression result types as used
UnusedTypeRemover was missing several expression node types. Now it
handles expressions through the general expression mechanism.
Mikko Rasa [Mon, 5 Apr 2021 12:43:02 +0000 (15:43 +0300)]
Make DumpTree able to dump arbitrary nodes
Remove that ability from Formatter since it makes assumptions about the
state of the nodes, like certain references existing.
Mikko Rasa [Mon, 5 Apr 2021 12:22:40 +0000 (15:22 +0300)]
Don't return references from apply functions
It's somewhat error prone, even though it hasn't caused any problems
yet.
Mikko Rasa [Mon, 5 Apr 2021 11:49:41 +0000 (14:49 +0300)]
Always use member access for interface blocks, even anonymous ones
Having variable references magically refer to variables inside interface
blocks causes trouble when generating SPIR-V.
This currently breaks one test case because UnusedVariableRemover can't
track access chains.
Mikko Rasa [Mon, 5 Apr 2021 11:13:36 +0000 (14:13 +0300)]
Output the interface block as is in the AST dump
This is more useful for debugging
Mikko Rasa [Mon, 5 Apr 2021 11:08:21 +0000 (14:08 +0300)]
Change the naming scheme for the interface block map
Adding a space in the keys for block name makes it impossible for them to
conflict with identifiers and allows instance names to be used directly.
Mikko Rasa [Mon, 5 Apr 2021 09:28:11 +0000 (12:28 +0300)]
Recognize matrix data order qualifiers and add one if missing
Mikko Rasa [Mon, 5 Apr 2021 09:25:49 +0000 (12:25 +0300)]
Require initializers on constant variables
Mikko Rasa [Mon, 5 Apr 2021 09:25:12 +0000 (12:25 +0300)]
Offset layout qualifiers are only allowed on uniform block members
Same goes for the alignment qualifier.
Mikko Rasa [Sun, 4 Apr 2021 09:35:00 +0000 (12:35 +0300)]
Add visitors to calculate offsets of struct members
It's not used yet, but will be required for creating SPIR-V modules.
Mikko Rasa [Sun, 4 Apr 2021 08:38:42 +0000 (11:38 +0300)]
Make function dependency collection its own visitor class
I need it for creating SPIR-V entry points too.
Mikko Rasa [Sun, 4 Apr 2021 08:32:31 +0000 (11:32 +0300)]
Store the index of the member in MemberAccess
Mikko Rasa [Sat, 3 Apr 2021 20:01:12 +0000 (23:01 +0300)]
Fix mismatched new[]/delete