benkyd/Examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewritten one of the shader load functions

Browse Source
This commit is contained in:
Ben
2019-01-13 17:52:44 +00:00
parent 34cb0fb1c6
commit f9e08e563c
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenGL/cube/src/main.cpp
View File

@@ -121,6 +121,7 @@ int main(int argc, char** argv) {
} }
game->isWindowClosed = true; game->isWindowClosed = true;
~simpleShader()
SDL_GL_DeleteContext(game->glContext); SDL_GL_DeleteContext(game->glContext);
SDL_DestroyWindow(game->window); SDL_DestroyWindow(game->window);
SDL_Quit(); SDL_Quit();

41
OpenGL/cube/src/shader.cpp
View File

@@ -34,38 +34,37 @@ Shader& Shader::load(GLenum type, std::string sourceLoc) {
const char* source = readShader(sourceLoc).c_str(); const char* source = readShader(sourceLoc).c_str();
if (type == GL_VERTEX_SHADER) { if (type == GL_VERTEX_SHADER) {
GLuint vertexShader = glCreateShader(GL_VERTEX_SHADER);
glShaderSource(vertexShader, 1, &source, NULL);
glCompileShader(vertexShader);
glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &m_status);
if (m_status == GL_FALSE) {
char buf[512];
glGetShaderInfoLog(vertexShader, 512, NULL, buf);
std::cerr << buf << std::endl;
}
m_vert = vertexShader;
m_vertLoc = sourceLoc; m_vertLoc = sourceLoc;
m_vertSource = (std::string)source; m_vertSource = (std::string)source;
std::cout << "Vertex shader at '" << sourceLoc << "' compiled..." << std::endl; m_vert = glCreateShader(GL_VERTEX_SHADER);
} else if (type == GL_FRAGMENT_SHADER) { glShaderSource(m_vert, 1, &source, NULL);
GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER); glCompileShader(m_vert);
glShaderSource(fragmentShader, 1, &source, NULL);
glCompileShader(fragmentShader);
glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &m_status); glGetShaderiv(m_vert, GL_COMPILE_STATUS, &m_status);
if (m_status == GL_FALSE) { if (m_status == GL_FALSE) {
char buf[512]; char buf[512];
glGetShaderInfoLog(fragmentShader, 512, NULL, buf); glGetShaderInfoLog(m_vert, 512, NULL, buf);
std::cerr << buf << std::endl; std::cerr << buf << std::endl;
} }
m_frag = fragmentShader; std::cout << "Vertex shader at '" << sourceLoc << "' compiled..." << std::endl;
} else if (type == GL_FRAGMENT_SHADER) {
m_fragLoc = sourceLoc; m_fragLoc = sourceLoc;
m_fragSource = (std::string)source; m_fragSource = (std::string)source;
std::cout << "Fragment shader at '" << sourceLoc << "' compiled..." << std::endl; m_frag = glCreateShader(GL_FRAGMENT_SHADER);
glShaderSource(m_frag, 1, &source, NULL);
glCompileShader(m_frag);
glGetShaderiv(m_frag, GL_COMPILE_STATUS, &m_status);
if (m_status == GL_FALSE) {
char buf[512];
glGetShaderInfoLog(m_frag, 512, NULL, buf);
std::cerr << buf << std::endl;
}
std::cout << "Vertex shader at '" << sourceLoc << "' compiled..." << std::endl;
} }
return *this; return *this;
} }