From 7225191a235e7a67e577a67071a1f1fb3e642b0f Mon Sep 17 00:00:00 2001 From: Krzysztof Rudnicki Date: Sat, 10 Sep 2022 13:07:13 +0200 Subject: [PATCH] chore: finish adding const --- .vscode/tasks.json | 2 +- Engine/engine/match | Bin 350344 -> 350344 bytes Engine/engine/renderLoop.cpp | 2 +- Engine/engine/shaders.cpp | 5 ++--- Engine/engine/shaders.hpp | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e4600fd..ad87ddf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,7 +2,7 @@ "tasks": [ { "type": "cppbuild", - "label": "C/C++: g++-11 build active file", + "label": "C/C++: g++-20 build active file", "command": "/usr/bin/g++", "args": [ "-g", diff --git a/Engine/engine/match b/Engine/engine/match index a44b145bdd9814c9fbfeb10f23b5787cc8bf8dba..5314c3a8580e031f1739227dd94ad912cc4d8af1 100755 GIT binary patch delta 392 zcmeC!DB7`6bVCQT$nBeQVa*aORj1+klw38Va z7?>vJ@c!#!U|@~$PR;^x6L{Z)xhW#7AZ`Tju}+X|u6e$oHIn52%gNWZEw#RYfxi zh~^3P8ipVo&L%gB*EfrXWoky&*6 U`jyNojP2s*n750cV=3$c02^0rcmMzZ delta 388 zcmeC!DB7`6bVCQT$n1nWL6QZ>f{tB{=ZT+@`Ce=<_tNG$%)!Xm3FfB+HNMO{0=n`9E1{6=& z-ur@Sr2u2#bn~A~ss@3Y$za(Sv1R>0*+3hq5U?Q{iM>E>C?`a33d1VK!aksY`}Cfl zOp1o?x*%Q56VFsbw7ENgv@uUSQLT{)(&x!lT?FDksMc6L5y8P?ega1=yhh8v2ufT+QiS zznDywtUw{cJaJCF7}zMzFbID}y~f0PpekOWnC%aLF|EG9r1Elm-)ZJp#_5(@m?gIF TU&$=O*e-sKdAs;ImclLo`-*M` diff --git a/Engine/engine/renderLoop.cpp b/Engine/engine/renderLoop.cpp index 5ae41f2..61016fc 100644 --- a/Engine/engine/renderLoop.cpp +++ b/Engine/engine/renderLoop.cpp @@ -89,7 +89,7 @@ unsigned int generateBindVAO() return vertexArrayObject; } -void copyVerticesArray(unsigned int vertexBufferObject, const float vertices[], const size_t sizeOfVertices, const GLenum boundBufferTarget) +void copyVerticesArray(const unsigned int vertexBufferObject, const float vertices[], const size_t sizeOfVertices, const GLenum boundBufferTarget) { // copy vertices array in array useful for OGL glBindBuffer(boundBufferTarget, vertexBufferObject); diff --git a/Engine/engine/shaders.cpp b/Engine/engine/shaders.cpp index 47eddb4..ad1db86 100644 --- a/Engine/engine/shaders.cpp +++ b/Engine/engine/shaders.cpp @@ -6,13 +6,12 @@ #include "constants.hpp" #include "misc.hpp" -unsigned int linkShaderObjectsShaderProgram(unsigned int vertexShaders, unsigned int fragmentShader) +unsigned int linkShaderObjectsShaderProgram(const unsigned int vertexShaders, const unsigned int fragmentShader) { // link shader objects into shader program // will store shader program id - unsigned int shaderProgram; // creates program - shaderProgram = glCreateProgram(); + const unsigned int shaderProgram = glCreateProgram(); // attachShaders glAttachShader(shaderProgram, vertexShaders); diff --git a/Engine/engine/shaders.hpp b/Engine/engine/shaders.hpp index 238fb31..7eee842 100644 --- a/Engine/engine/shaders.hpp +++ b/Engine/engine/shaders.hpp @@ -4,7 +4,7 @@ #include #include -unsigned int linkShaderObjectsShaderProgram(unsigned int vertexShaders, unsigned int fragmentShader); +unsigned int linkShaderObjectsShaderProgram(const unsigned int vertexShaders, const unsigned int fragmentShader); std::pair compileShaders(); unsigned int compileShader(const GLenum shaderType, const char *shaderSource); int shaderCompilationSuccessful(const unsigned int shader);