Skip to content

Commit

Permalink
[release] v33.0 (#7)
Browse files Browse the repository at this point in the history
* [emapp] add static *ConstString methods and remove private utils from Validator
* [emapp] adjust validation severity
* [emapp] add testing severity filter at name check
* [emapp] add material vertex indes count check
* [emapp] add kMessageTypeLabelNotAssigned(Bone|Morph)Object
* [emapp] add bone and parent relation validation
* [emapp] clang-format
* [emapp] add constraint bone validation
* [emapp] remove buttons set from vertex/face panes
* [emapp] restrict modifying material action with single selection
* [emapp] add warning severity flag when model editing is enabled
* [emapp] add check whether loading motion is camera/light or not
* [emapp] disable delete/move model object actions when multiple selection detected
* [emapp] add vertex from face reference validation
* [emapp] add more select actions
* [emapp] remove unused phrases
* [emapp] add "New Model" and "Convert to Model" action
* [emapp] add dynamic parent bone validation
* [docs] add note for dynamic parent bone validation
* [emapp] adjust translation from internal descriptive
* [emapp] replace to use CollapsingHeader as other uses
* [emapp] implement generating new model action
* [emapp] move MenuItemTypeFileNewModel action as Project::newModel
* [emapp] replace to use nanoem_language_type array
* [emapp] implement provisional converting accessory to model
* [emapp] fix a compile error due to lack of noexcept
* [emapp] move bone/label name constants to inner model classes
* [emapp] add binding all vertices with root parent bone
* [win32] replace to use same as FileUtils uses to prevent encoding error
* [win32] error should not be overriden by plugin decoder
* [emapp] more debug markers
* [emapp] fixed a bug of blitting same viewport handle
* [docs] update for 33.0
* [emapp] clang-format
* [emapp] fixed memory leaks bugs
* [macos] add "New Model" menu item
* [emapp] display error modal dialog when new model action is failed
* [emapp] creating a new model now requires saving the project
* [emapp] add line between system message and error message
* [emapp] remove creating user data to prevent memory leaks
* [emapp] update built-in binary shaders
* [emapp] fix camera angle and preparation
* [emapp] implement camera angle correction at loading project
* [docs] update for 33.0
* [emapp] add experimental directional orientate bone state
* [emapp] clang-format
* [docs] update for 33.0
* [emapp] implement detaching viewport window
* [emapp] adjust timeline padding for viewport window detach
* [emapp] add mnemonic keys (D, G) in project menu
* [emapp] correct line shader uniform size on OpenGL
* [emapp] set force CPU skinning at model editing
* [emapp] fixed a bug rebuilding vertex buffer may not work properly
* [emapp] rename mode property to simulationMode in PhysicsEngine
* [emapp] add saving physics simulation mode and grid visible in project state
* [emapp] remove redundant saving physics simulation mode from CapturingPassState
* [emapp] perform saving/restoring state with ILazyExecutionCommand
* [docs] update for 33.0
* [emapp] update for 33.0
* [macOS] fix compile error
* [emapp] clang-format
* [emapp] add diagnostics support for PMM
* [sandbox] fix build failure
* [emapp] check diagnostics object is not null
* [emapp] add drawing vertex normal option
* [emapp] fix memory leaks when project cannot be loaded properly
* [emapp] implement plot24 for WaveFormPanelDrawer
* [emapp] prevent overread of audio buffer
* [emapp] clang-format
* [plugin] fixed a bug decoding error occurs when both audio/video exists
* [emapp] fixed a bug drawing background video with effect doesn't work properly
* [cmake] add CHQX decoder option to ffmpeg
* [win32] fixed a bug video URI is empty at saving project
* [docs] update for 33.0
* [emapp] correct calculation of waveform offset
* [docs] update for 33.0
* [emapp] change all* methods in Project to pointers array as possible
* [emapp] add selection to morphs buttons
* [emapp] fix build failure
* [emapp] clang-format
* [emapp] add more toggle buttons
* [nanoem] constraint object should reset bone references
* [nanoem] add an API of removing constraint object from bone
* [emapp] add slider/drag with disable to prevent action while playing
* [emapp] interpolation dialog now do nothing while playing
* [emapp] cleanup bone combobox and add setting axis actions
* [emapp] detach UVEditDialog from ModelEditCommandDialog
* [emapp] add assign operator of Error
* [emapp] reduce warnings
* [emapp] add translation of "Display UV Mesh"
* [emapp] implement clearing textures
* [emapp] fixed a bug setting texture will not found
* [emapp] add camera/light section to ModelEditCommandDialog
* [emapp] split loading and applying from BindPose
* [emapp] clang-format
* [emapp] move BaseSetTextureCallback into anonymous namespace
* [emapp] add ScopedMutableMorph* with initial creation
* [emapp] forgot to add base destructor
* [emapp] move creating model object actions from selection
* [docs] update for 33.0
* [dependencies] add tinyobjloader-c as dependency
* [emapp] add destroy API to handle project state destruction properly
* [emapp] fix build on windows with 32bit
* [emapp] add check restoring state is same project
* [sandbox] rework transformer
* [emapp] implement loading obj file via tinyobjloader-c
* [sandbox] fix double free bug
* [emapp] add validation of model name and comment
* [emapp] clang-format
* [emapp] adjust model parameter dialog layout
* [emapp] add resetting name using resetLanguage
* [emapp] add Create(StagingBone|BoneMorphFromPose)Command
* [emapp] fixed a bug skin deformer doesn't work property when bone changes
* [emapp] rename to CreateBoneAsStagingParentCommand
* [emapp] correct moving model object behavior
* [win32] destroying output buffer view explicitly
* [emapp] add CreateBoneAsStagingChildCommand
* [emapp] prohibit changing model while model editing is active
* [emapp] clang-format
* [emapp] add menu bar to model parameter dialog and more actions
* [emapp] disable PMX 2.1 features when PMX version is 2.0
* [emapp] forgot to strip mnemonic in preference dialog
* [emapp] prohibit changing language when model editing is enabled to prevent unexpected behavior
* [docs] update for 33.0
* [emapp] add CreateBoneAsDestinationCommand
* [emapp] add CreateIntermediateJointFromTwoRigidBodiesCommand
* [emapp] apply partial translations to ModelEditCommandDialog
* [emapp] correct moving bones/vertices behavior with GizmoController
* [emapp] correct moving rigidbody/vertex behavior with GizmoController
* [emapp] add translation
* [emapp] add model version selection
* [emapp] add measure tab and TransformModelCommand
* [emapp] fix build failure
* [emapp] clang-format
* [emapp] forgot to call performAllBonesTransform
* [emapp] detached TransformModelCommand
* [emapp] detached UndoCommand as LazyPushUndoCommand
* [docs] update for 33.0
* [emapp] add CreateVertexMorphFromModelCommand
* [emapp] add CopyMaterialFromModelCommand
* [emapp] forgot to create and bind model::Mateiral
* [emapp] implement undo of MoveMaterial(Up|Down)Command
* [emapp] prevent unexpected softbody behavior
* [emapp] reduce warnings
* [macOS] ensure fileURI is canonicalized
* [emapp] implement undo of DeleteMaterialCommand
* [emapp] add common VertexIndexList type and use it
* [sdk] add softbody selection and model object masking API
* [emapp] add calling of ABI 2.1
* [emapp] add isEditingMasked to model::Material
* [emapp] fix build failure
* [emapp] add resetting measure state
* [emapp] add CreateMaterialCommand
* [emapp] fix moving material vertex indices behavior
* [emapp] implement CircleSelector
* [emapp] apply circle selection support
* [emapp] add MergeMaterialCommand
* [emapp] ScopedMutableModel now takes status pointer
* [emapp] add material selection from vertices/faces action
* [emapp] aggregate vertex type selection
* [docs] move action to menu section and add missing descriptions
* [emapp] add model edit menu title translation
* [docs] add measure tab description
* [emapp] shrink hovered model object to bone only
* [emapp] rename drawHardwareMonitor to drawPerformanceMonitor
* [emapp] rename member variables for clarify
* [emapp] add more translations
* [emapp] more translations
* [emapp] rename member variables
* [emapp] add error when model motion is loading without active model
* [emapp] add test of missing bones/morphs at loading model motion
* [emapp] clang-format
* [emapp] add deleting model object states
* [nanoem] implement missing applying change model objects
* [win32] fixed a bug custom save dialog doesn't work properly
* [emapp] implement weight transfer feature
* [emapp] make m_applicationPtr in BaseNonModalDialogWindow private
* [emapp] forgot to add NULL terminator
* [nanoem] remove unused variable
* [emapp] clang-format
* [emapp] integrate model edit command to ImGuiWindow
* [nanoem] correct spelling function name
* [emapp] reduce using const_cast
* [emapp] add AddBoneCommand to make undo-able
* [emapp] move DrawType in Project to IState
* [emapp] add model::IGizmo and model::IVertexWeightBrush
* [dependencies] upgrade protobuf-c to 1.4.0
* [emapp] provisional implementation of painting vertex weights
* [emapp] update translations
* [emapp] set gray as base vertex weight color
* [emapp] add batch change model object panel
* [emapp] move implementation to VertexWeightBrush from PaintVertexWeightState
* [emapp] add forgotten paint method
* [emapp] replace argument of Project with Model
* [emapp] add PaintVertexWeightCommand
* [docs] update for 33.0
* [emapp] add batch model object commands
* [emapp] add undo stack for model editing
* [emapp] replace to use pointer
* [emapp] implemtn batch model object changes
* [emapp] clang-format
* [dependencies] upgrade glslang/spirv-cross
* [dependencies] upgrade sentry-native to 0.4.9
* [fx9] fix build failure
* [docs] add batch editing model objects note
* [plugin] add ModelIOSetEditingModeEnabled
* [plugin] implement additional API from 2.1
* [emapp] disable model/motion plugins when model editing is enabled
* [emapp] reimplement UVA selection and batch vertex bone settings
* [emapp] add generating primitive dialogs
* [emapp] rename VertexWeightBrush to VertexWeightPainter and make owned
* [emapp] generating primitive now works provisionally
* [cmake] remove linking glslang's libraries no longer exists
* [emapp] set PAR_SHAPES_T uint32_t
* [emapp] add cylinder/sphere primitive generation and translation
* [emapp] revert 519d280 partially
* [docs] tweaks of README
* [emapp] implement backup model data before editing model mode
* [emapp] add recording undo command name
* [win32] implement confirm saving project dialog before exporting image/video
* [emapp] prohibit opening model dialog without saving project
* [emapp] relaxed dirty check and loaded/saved model dirty state should be cleared
* [emapp] implement saving edited model at dialog destruction
* [docs] add missing descriptions of model editing feature
* [emapp] implement symmetric bone/rigidbody/joint selection
* [emapp] rename reverse to symmetric
* [emapp] move drawing model edit menubar into viewport
* [emapp] integrate drawing primitive 2D into ImGuiWindow
* [emapp] clang-format
* [emapp] recalculate pivot matrix at symmetric selection
* [emapp] prefer to use canonicalName rather than name
* [docs] add inner links of model/motion plugin
* [emapp] implemnt showing only target bone connection and local axes
* [emapp] forgot to remove override modifier
* [emapp] add icon at showing error dialog
* [emapp] replace to use CreateDragged(Parent|Target)BoneCommand
* [emapp] disable material duplication menu action
* [docs] add release date of 31.5.0
* [docs] update for 33.0
* [emapp] clang-format
* [docs] update images for 33.0
* [emapp] implement base brush for vertex painter
* [emapp] add translation of "Collision Group/Mask"
* [emapp] correct base brush behavior and check masking vertex state
* [emapp] reduce warnings
* [emapp] memory allocation at once
* [emapp] add target model name to motion diagnostics message
* [emapp] clang-format
* [emapp] fix build failure
* [emapp] update binaries
  • Loading branch information
hkrn authored Jun 10, 2021
1 parent 88925df commit 813bd1d
Show file tree
Hide file tree
Showing 350 changed files with 36,050 additions and 11,307 deletions.
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,12 @@
[submodule "dependencies/libsoundio"]
path = dependencies/libsoundio
url = https://github.com/andrewrk/libsoundio
[submodule "dependencies/nativefiledialog"]
path = dependencies/nativefiledialog
url = https://github.com/mlabbe/nativefiledialog
[submodule "dependencies/tbb"]
path = dependencies/tbb
url = https://github.com/wjakob/tbb.git
[submodule "dependencies/imguifiledialog"]
path = dependencies/imguifiledialog
url = https://github.com/aiekick/ImGuiFileDialog
[submodule "dependencies/tinyobjloader-c"]
path = dependencies/tinyobjloader-c
url = https://github.com/syoyo/tinyobjloader-c
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option(NANOEM_ENABLE_DEBUG_ALLOCATOR "Enable building debug memory allocator" OF
option(NANOEM_ENABLE_DEBUG_LABEL "Enable building nanoem with debug labels." OFF)
option(NANOEM_ENABLE_GLFW "Enable GLFW based application option." OFF)
option(NANOEM_ENABLE_IMGUI_INDEX32 "Enable building ImGui with 32bit indices support" ON)
option(NANOEM_ENABLE_IMGUI_FILE_DIALOG "Enable building ImGuiFileDialog (https://github.com/aiekick/ImGuiFileDialog) option" OFF)
option(NANOEM_ENABLE_LTO "Enable Link Time Optimization when clang is used." OFF)
option(NANOEM_ENABLE_MIMALLOC "Enable mimalloc as allocator" OFF)
option(NANOEM_ENABLE_MSAN "Enable clang/gcc MSan (memory sanitizer) option." OFF)
Expand Down
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,40 @@

[![Build Status](https://github.com/hkrn/nanoem/workflows/CI/badge.svg)](https://github.com/hkrn/nanoem/actions) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-blue.svg)](https://opensource.org/licenses/MPL-2.0) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

nanoem is an MMD (MikuMikuDance) like application mainly built for OSX.
nanoem is an [MMD (MikuMikuDance)](https://sites.google.com/view/vpvp/) compatible implementation and its like application mainly built for macOS.

- [Binary Distribution](https://bowlroll.net/file/71328)
- [Usage Manual](https://nanoem.readthedocs.io)
- [Binary Distribution of macOS](https://bowlroll.net/file/71328)
- [Binary Distribution of Windows](https://bowlroll.net/file/122592)
- [Usage Manual](https://nanoem.readthedocs.io)

## How to build?

### Prerequisites

- [cmake](https://cmake.org) (> 3.5)
- [cmake](https://cmake.org) (>= 3.5)
- C++14 compliant compiler
- confirmed on Clang and Visual Studio 2017
- [git](https://git-scm.com)
- [ninja-build](https://ninja-build.org/)
- Optional but recommend
- Optional but recommend on macOS/Linux

### Minimum build instruction

See also [GitHub Action Workflow](.github/workflows/main.yml).

```bash
git submodule update --init --recurse

# needs setting NANOEM_TARGET_COMPILER explicitly when the compiler is clang (default is gcc on Linux)
export NANOEM_TARGET_COMPILER=clang
cmake -P scripts/build.cmake
mkdir out
cd out
cmake -G Ninja ..
cmake --build .

# OpenGL 3.3 Core Profile or higher is required to run on Linux
cd sapp && ./nanoem
```

## Architecture
Expand Down
11 changes: 1 addition & 10 deletions dependencies/fx9/cmake/common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,18 @@ endfunction()

# glslang
fx9_cmake_get_install_path("glslang" GLSLANG_BASE_PATH GLSLANG_INSTALL_PATH_DEBUG GLSLANG_INSTALL_PATH_RELEASE)
find_library(GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG NAMES GenericCodeGend GenericCodeGen PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE NAMES GenericCodeGen PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_GLSLANG_LIBRARY_DEBUG NAMES glslangd glslang PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_GLSLANG_LIBRARY_RELEASE NAMES glslang PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_HLSL_LIBRARY_DEBUG NAMES HLSLd HLSL PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_HLSL_LIBRARY_RELEASE NAMES HLSL PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG NAMES MachineIndependentd MachineIndependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE NAMES MachineIndependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_OGLCOMPILER_LIBRARY_DEBUG NAMES OGLCompilerd OGLCompiler PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_OGLCOMPILER_LIBRARY_RELEASE NAMES OGLCompiler PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_OSDEPENDENT_LIBRARY_DEBUG NAMES OSDependentd OSDependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_OSDEPENDENT_LIBRARY_RELEASE NAMES OSDependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_SPIRV_LIBRARY_DEBUG NAMES SPIRVd SPIRV PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
find_library(GLSLANG_SPIRV_LIBRARY_RELEASE NAMES SPIRV PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
mark_as_advanced(GLSLANG_OSDEPENDENT_LIBRARY_DEBUG GLSLANG_HLSL_LIBRARY_DEBUG GLSLANG_OGLCOMPILER_LIBRARY_DEBUG GLSLANG_SPIRV_LIBRARY_DEBUG GLSLANG_GLSLANG_LIBRARY_DEBUG
GLSLANG_OSDEPENDENT_LIBRARY_RELEASE GLSLANG_HLSL_LIBRARY_RELEASE GLSLANG_OGLCOMPILER_LIBRARY_RELEASE GLSLANG_SPIRV_LIBRARY_RELEASE GLSLANG_GLSLANG_LIBRARY_RELEASE
GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE)
GLSLANG_OSDEPENDENT_LIBRARY_RELEASE GLSLANG_HLSL_LIBRARY_RELEASE GLSLANG_OGLCOMPILER_LIBRARY_RELEASE GLSLANG_SPIRV_LIBRARY_RELEASE GLSLANG_GLSLANG_LIBRARY_RELEASE)

# spirv-cross
fx9_cmake_get_install_path("spirv-cross" SPIRV_CROSS_BASE_PATH SPIRV_CROSS_INSTALL_PATH_DEBUG SPIRV_CROSS_INSTALL_PATH_RELEASE)
Expand Down Expand Up @@ -105,8 +100,6 @@ target_link_libraries(fx9 fx9_protobuf
optimized ${GLSLANG_HLSL_LIBRARY_RELEASE}
optimized ${GLSLANG_OSDEPENDENT_LIBRARY_RELEASE}
optimized ${GLSLANG_GLSLANG_LIBRARY_RELEASE}
optimized ${GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE}
optimized ${GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE}
optimized ${SPIRV_CROSS_CORE_LIBRARY_RELEASE}
optimized ${SPIRV_CROSS_CPP_LIBRARY_RELEASE}
optimized ${SPIRV_CROSS_GLSL_LIBRARY_RELEASE}
Expand All @@ -117,8 +110,6 @@ target_link_libraries(fx9 fx9_protobuf
debug ${GLSLANG_HLSL_LIBRARY_DEBUG}
debug ${GLSLANG_OSDEPENDENT_LIBRARY_DEBUG}
debug ${GLSLANG_GLSLANG_LIBRARY_DEBUG}
debug ${GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG}
debug ${GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG}
debug ${SPIRV_CROSS_CORE_LIBRARY_DEBUG}
debug ${SPIRV_CROSS_CPP_LIBRARY_DEBUG}
debug ${SPIRV_CROSS_GLSL_LIBRARY_DEBUG}
Expand Down
6 changes: 3 additions & 3 deletions dependencies/fx9/include/fx9/Parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

/* GLSLang */
#define ENABLE_HLSL
#include "glslang/HLSL/hlslParseHelper.h"
#include "glslang/HLSL/hlslParseables.h"
#include "glslang/HLSL/hlslScanContext.h"
#include "hlsl/hlslParseHelper.h"
#include "hlsl/hlslParseables.h"
#include "hlsl/hlslScanContext.h"

namespace fx9 {

Expand Down
10 changes: 5 additions & 5 deletions dependencies/fx9/sokol.cc
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct Main {
if (succeeded) {
bool found = false;
for (int i = SG_MAX_SHADERSTAGE_IMAGES - 1; i >= 0; i--) {
const sg_image_type type = images[i].type;
const sg_image_type type = images[i].image_type;
if (!found && type != _SG_IMAGETYPE_DEFAULT) {
found = true;
}
Expand Down Expand Up @@ -88,8 +88,8 @@ struct Main {
desc.source = shader->msl;
break;
case FX9__EFFECT__SHADER__BODY_SPIRV:
desc.byte_code = shader->spirv.data;
desc.byte_code_size = shader->spirv.len;
desc.bytecode.ptr = shader->spirv.data;
desc.bytecode.size = shader->spirv.len;
break;
default:
break;
Expand Down Expand Up @@ -268,8 +268,8 @@ struct Main {
id.height = 1;
id.pixel_format = SG_PIXELFORMAT_RGBA8;
uint32_t pixel = 0;
id.content.subimage[0][0].ptr = &pixel;
id.content.subimage[0][0].size = sizeof(pixel);
id.data.subimage[0][0].ptr = &pixel;
id.data.subimage[0][0].size = sizeof(pixel);
sg_image ih = sg_make_image(&id);
for (int i = 0; i < SG_MAX_SHADERSTAGE_IMAGES; i++) {
if (sd.fs.images[i].name) {
Expand Down
1 change: 0 additions & 1 deletion dependencies/fx9/src/Compiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ getDefaultResourceLimit(TBuiltInResource &resources)
/* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,
/* .maxDualSourceDrawBuffersEXT = */ 1,

/* .limits = */
{
Expand Down
10 changes: 5 additions & 5 deletions dependencies/fx9/src/Parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#endif

/* GLSLang */
#include "glslang/HLSL/hlslAttributes.h"
#include "glslang/HLSL/hlslParseHelper.h"
#include "glslang/HLSL/hlslParseables.h"
#include "glslang/HLSL/hlslScanContext.h"
#include "glslang/HLSL/hlslTokenStream.h"
#include "hlsl/hlslAttributes.h"
#include "hlsl/hlslParseHelper.h"
#include "hlsl/hlslParseables.h"
#include "hlsl/hlslScanContext.h"
#include "hlsl/hlslTokenStream.h"

using namespace glslang;

Expand Down
2 changes: 1 addition & 1 deletion dependencies/glslang
Submodule glslang updated 995 files
2 changes: 1 addition & 1 deletion dependencies/imgui
Submodule imgui updated 103 files
1 change: 1 addition & 0 deletions dependencies/imguifiledialog
Submodule imguifiledialog added at 96d4d5
1 change: 0 additions & 1 deletion dependencies/nativefiledialog
Submodule nativefiledialog deleted from 67345b
2 changes: 1 addition & 1 deletion dependencies/protobuf-c
Submodule protobuf-c updated 50 files
+0 −1 .commit_docs.sh
+146 −0 .github/workflows/build.yml
+0 −32 .travis.yml
+38 −0 ChangeLog
+54 −2 Makefile.am
+8 −2 README.md
+74 −11 build-cmake/CMakeLists.txt
+1 −1 configure.ac
+4 −3 protobuf-c/libprotobuf-c.pc.in
+33 −26 protobuf-c/protobuf-c.c
+6 −2 protobuf-c/protobuf-c.h
+86 −0 protobuf-c/protobuf-c.proto
+9 −9 protoc-c/c_bytes_field.cc
+2 −2 protoc-c/c_bytes_field.h
+13 −13 protoc-c/c_enum.cc
+2 −2 protoc-c/c_enum.h
+5 −5 protoc-c/c_enum_field.cc
+2 −2 protoc-c/c_enum_field.h
+1 −1 protoc-c/c_extension.cc
+3 −3 protoc-c/c_extension.h
+19 −11 protoc-c/c_field.cc
+3 −3 protoc-c/c_field.h
+25 −33 protoc-c/c_file.cc
+1 −4 protoc-c/c_file.h
+14 −11 protoc-c/c_generator.cc
+9 −3 protoc-c/c_generator.h
+81 −96 protoc-c/c_helpers.cc
+26 −37 protoc-c/c_helpers.h
+101 −48 protoc-c/c_message.cc
+12 −6 protoc-c/c_message.h
+4 −4 protoc-c/c_message_field.cc
+1 −1 protoc-c/c_message_field.h
+5 −5 protoc-c/c_primitive_field.cc
+1 −1 protoc-c/c_primitive_field.h
+20 −20 protoc-c/c_service.cc
+2 −2 protoc-c/c_service.h
+15 −6 protoc-c/c_string_field.cc
+2 −2 protoc-c/c_string_field.h
+4 −4 t/generated-code2/common-test-arrays.h
+36 −3 t/generated-code2/test-generated-code2.c
+1 −0 t/issue204/.gitignore
+48 −0 t/issue204/issue204.c
+15 −0 t/issue204/issue204.proto
+1 −1 t/issue220/issue220.c
+12 −0 t/issue389/issue389.proto
+1 −0 t/issue440/.gitignore
+30 −0 t/issue440/issue440.c
+9 −0 t/issue440/issue440.proto
+8 −0 t/test-full.proto
+4 −0 t/test.proto
2 changes: 1 addition & 1 deletion dependencies/sentry-native
Submodule sentry-native updated 71 files
+16 −0 .github/workflows/ci.yml
+5 −5 .gitmodules
+56 −0 CHANGELOG.md
+46 −23 CMakeLists.txt
+17 −16 README.md
+8 −15 examples/example.c
+50 −10 external/CMakeLists.txt
+1 −1 external/breakpad
+1 −1 external/crashpad
+1 −1 external/libunwindstack-ndk
+1 −0 fuzzing-examples/macos-event.json
+1 −0 fuzzing-examples/macos-session.json
+102 −13 include/sentry.h
+16 −5 src/backends/sentry_backend_breakpad.cpp
+11 −2 src/backends/sentry_backend_crashpad.cpp
+6 −23 src/backends/sentry_backend_inproc.c
+220 −185 src/modulefinder/sentry_modulefinder_linux.c
+31 −12 src/modulefinder/sentry_modulefinder_linux.h
+3 −3 src/path/sentry_path_unix.c
+1 −0 src/path/sentry_path_windows.c
+12 −14 src/sentry_backend.h
+4 −0 src/sentry_boot.h
+11 −4 src/sentry_core.c
+0 −5 src/sentry_core.h
+1 −1 src/sentry_database.c
+22 −9 src/sentry_envelope.c
+38 −57 src/sentry_json.c
+6 −3 src/sentry_json.h
+7 −8 src/sentry_scope.c
+2 −1 src/sentry_scope.h
+3 −0 src/sentry_sync.c
+44 −7 src/sentry_sync.h
+32 −14 src/sentry_utils.c
+24 −1 src/sentry_utils.h
+120 −20 src/sentry_value.c
+8 −0 src/sentry_value.h
+6 −2 src/transports/sentry_transport_curl.c
+14 −9 src/unwinder/sentry_unwinder_libbacktrace.c
+12 −25 src/unwinder/sentry_unwinder_libunwindstack.cpp
+9 −1 tests/__init__.py
+3 −4 tests/assertions.py
+4 −1 tests/cmake.py
+2 −0 tests/conditions.py
+1 −0 tests/fuzzing-failures/id-000000,sig-06,src-000560,op-havoc,rep-2
+ tests/fuzzing-failures/id-000000,sig-11,src-000033+000005,op-splice,rep-16
+ tests/fuzzing-failures/id-000000,sig-11,src-000320,op-havoc,rep-2
+ tests/fuzzing-failures/id-000000,sig-11,src-000494+000073,op-splice,rep-8
+ tests/fuzzing-failures/id-000001,sig-11,src-000052+000222,op-splice,rep-32
+1 −0 tests/fuzzing-failures/id-000001,sig-11,src-000215+000415,op-splice,rep-16
+1 −0 tests/fuzzing-failures/id-000002,sig-11,src-000339+000110,op-splice,rep-16
+ tests/fuzzing-failures/id-000002,sig-11,src-000447+000419,op-splice,rep-32
+ tests/fuzzing-failures/id-000003,sig-11,src-000399+000468,op-splice,rep-32
+ tests/fuzzing-failures/id-000004,sig-11,src-000440+000369,op-splice,rep-2
+3 −2 tests/test_integration_http.py
+4 −3 tests/test_integration_stdout.py
+2 −0 tests/unit/.gitattributes
+22 −0 tests/unit/CMakeLists.txt
+77 −0 tests/unit/fuzz.c
+1 −1 tests/unit/test_attachments.c
+2 −2 tests/unit/test_basic.c
+5 −5 tests/unit/test_consent.c
+1 −1 tests/unit/test_envelopes.c
+66 −0 tests/unit/test_fuzzfailures.c
+2 −2 tests/unit/test_logger.c
+59 −29 tests/unit/test_modulefinder.c
+3 −1 tests/unit/test_mpack.c
+2 −2 tests/unit/test_session.c
+4 −4 tests/unit/test_uninit.c
+49 −1 tests/unit/test_value.c
+3 −0 tests/unit/tests.inc
+29 −0 tests/valgrind.txt
2 changes: 1 addition & 1 deletion dependencies/spirv-cross
Submodule spirv-cross updated 412 files
1 change: 1 addition & 0 deletions dependencies/tinyobjloader-c
Submodule tinyobjloader-c added at 7212b1
Loading

0 comments on commit 813bd1d

Please sign in to comment.