Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[idea / wip] - ofShader::setUniformBufferObject to easily pass a struct to a shader #8097

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −2
Open

[idea / wip] - ofShader::setUniformBufferObject to easily pass a struct to a shader #8097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7debe3a
ubo
dimitre Aug 29, 2024
8a9f85c
cleanup
dimitre Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/projectGenerator
Open in desktop
Submodule projectGenerator updated 21 files
+1 −1 .github/workflows/build-linux.yml
+0 −1 .gitignore
+1 −7 commandLine/src/addons/ofAddon.cpp
+3 −3 commandLine/src/defines.h
+32 −36 commandLine/src/main.cpp
+6 −12 commandLine/src/projects/VSCodeProject.cpp
+0 −2 commandLine/src/projects/baseProject.cpp
+3 −9 commandLine/src/projects/visualStudioProject.cpp
+8 −16 commandLine/src/projects/xcodeProject.cpp
+4 −12 commandLine/src/utils/Utils.cpp
+1 −3 commandLine/src/utils/Utils.h
+39 −204 frontend/app.js
+5 −22 frontend/index.html
+125 −326 frontend/index.js
+30 −30 frontend/npm-shrinkwrap.json
+1 −1 frontend/package.json
+17 −22 frontend/preload.js
+27 −16 scripts/osx/ci_build_pg.sh
+1 −1 scripts/osx/ci_install_core.sh
+1 −1 scripts/vs/ci_install.sh
+18 −45 scripts/vs/test_cmdline.sh
9 changes: 9 additions & 0 deletions libs/openFrameworks/gl/ofShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,15 @@ void ofShader::setUniform4i(const string & name, int v1, int v2, int v3, int v4)
}
}

//--------------------------------------------------------------
void ofShader::setUniformBufferObject(const std::string & name, const void * data, GLsizeiptr dataSize) {
if (!bufferObjectsCache[name].isAllocated()) {
bufferObjectsCache[name].allocate(dataSize, GL_STATIC_DRAW);
}
bufferObjectsCache[name].updateData(dataSize, data);
bufferObjectsCache[name].bindBase(GL_UNIFORM_BUFFER, getUniformBlockIndex(name));
}

//--------------------------------------------------------------
void ofShader::setUniform1f(const string & name, float v1) const {
if (bLoaded) {
Expand Down
6 changes: 6 additions & 0 deletions libs/openFrameworks/gl/ofShader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ class ofShader {
void setUniform3i(const std::string & name, int v1, int v2, int v3) const;
void setUniform4i(const std::string & name, int v1, int v2, int v3, int v4) const;


// Dmtr testing
void setUniformBufferObject(const std::string & name, const void * data, GLsizeiptr dataSize);

void setUniform1f(const std::string & name, float v1) const;
void setUniform2f(const std::string & name, float v1, float v2) const;
void setUniform3f(const std::string & name, float v1, float v2, float v3) const;
Expand Down Expand Up @@ -278,6 +282,8 @@ class ofShader {
};

std::unordered_map<GLenum, Shader> shaders;

std::unordered_map<std::string, ofBufferObject> bufferObjectsCache;
std::unordered_map<std::string, GLint> uniformsCache;
mutable std::unordered_map<std::string, GLint> attributesBindingsCache;

Expand Down
2 changes: 1 addition & 1 deletion scripts/apothecary
Open in desktop
Submodule apothecary updated 254 files
Loading