Run clang-formats for merge
This commit is contained in:
RichardG867
@@ -40,10 +40,10 @@
|
||||
#include <86box/plat.h>
|
||||
#include <86box/win_opengl_glslp.h>
|
||||
|
||||
/**
|
||||
* @brief Default vertex shader.
|
||||
/**
|
||||
* @brief Default vertex shader.
|
||||
*/
|
||||
static const GLchar* vertex_shader = "#version 130\n\
|
||||
static const GLchar *vertex_shader = "#version 130\n\
|
||||
in vec2 VertexCoord;\n\
|
||||
in vec2 TexCoord;\n\
|
||||
out vec2 tex;\n\
|
||||
@@ -55,7 +55,7 @@ void main(){\n\
|
||||
/**
|
||||
* @brief Default fragment shader.
|
||||
*/
|
||||
static const GLchar* fragment_shader = "#version 130\n\
|
||||
static const GLchar *fragment_shader = "#version 130\n\
|
||||
in vec2 tex;\n\
|
||||
uniform sampler2D texsampler;\n\
|
||||
out vec4 color;\n\
|
||||
@@ -65,208 +65,204 @@ void main() {\n\
|
||||
|
||||
/**
|
||||
* @brief OpenGL shader program build targets
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
OPENGL_BUILD_TARGET_VERTEX,
|
||||
OPENGL_BUILD_TARGET_FRAGMENT,
|
||||
OPENGL_BUILD_TARGET_LINK
|
||||
*/
|
||||
typedef enum {
|
||||
OPENGL_BUILD_TARGET_VERTEX,
|
||||
OPENGL_BUILD_TARGET_FRAGMENT,
|
||||
OPENGL_BUILD_TARGET_LINK
|
||||
} opengl_build_target_t;
|
||||
|
||||
/**
|
||||
* @brief Reads a whole file into a null terminated string.
|
||||
* @param Path Path to the file relative to executable path.
|
||||
* @return Pointer to the string or NULL on error. Remember to free() after use.
|
||||
*/
|
||||
static char* read_file_to_string(const char* path)
|
||||
*/
|
||||
static char *
|
||||
read_file_to_string(const char *path)
|
||||
{
|
||||
FILE* file_handle = plat_fopen(path, "rb");
|
||||
FILE *file_handle = plat_fopen(path, "rb");
|
||||
|
||||
if (file_handle != NULL)
|
||||
{
|
||||
/* get file size */
|
||||
fseek(file_handle, 0, SEEK_END);
|
||||
if (file_handle != NULL) {
|
||||
/* get file size */
|
||||
fseek(file_handle, 0, SEEK_END);
|
||||
|
||||
size_t file_size = (size_t)ftell(file_handle);
|
||||
size_t file_size = (size_t) ftell(file_handle);
|
||||
|
||||
fseek(file_handle, 0, SEEK_SET);
|
||||
fseek(file_handle, 0, SEEK_SET);
|
||||
|
||||
/* read to buffer and close */
|
||||
char* content = (char*)malloc(sizeof(char) * (file_size + 1));
|
||||
/* read to buffer and close */
|
||||
char *content = (char *) malloc(sizeof(char) * (file_size + 1));
|
||||
|
||||
if (!content)
|
||||
return NULL;
|
||||
if (!content)
|
||||
return NULL;
|
||||
|
||||
size_t length = fread(content, sizeof(char), file_size, file_handle);
|
||||
size_t length = fread(content, sizeof(char), file_size, file_handle);
|
||||
|
||||
fclose(file_handle);
|
||||
fclose(file_handle);
|
||||
|
||||
content[length] = 0;
|
||||
content[length] = 0;
|
||||
|
||||
return content;
|
||||
}
|
||||
return NULL;
|
||||
return content;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int check_status(GLuint id, opengl_build_target_t build_target, const char* shader_path)
|
||||
static int
|
||||
check_status(GLuint id, opengl_build_target_t build_target, const char *shader_path)
|
||||
{
|
||||
GLint status = GL_FALSE;
|
||||
GLint status = GL_FALSE;
|
||||
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderiv(id, GL_COMPILE_STATUS, &status);
|
||||
else
|
||||
glGetProgramiv(id, GL_LINK_STATUS, &status);
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderiv(id, GL_COMPILE_STATUS, &status);
|
||||
else
|
||||
glGetProgramiv(id, GL_LINK_STATUS, &status);
|
||||
|
||||
if (status == GL_FALSE)
|
||||
{
|
||||
int info_log_length;
|
||||
if (status == GL_FALSE) {
|
||||
int info_log_length;
|
||||
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
|
||||
else
|
||||
glGetProgramiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
|
||||
else
|
||||
glGetProgramiv(id, GL_INFO_LOG_LENGTH, &info_log_length);
|
||||
|
||||
GLchar* info_log_text = (GLchar*)malloc(sizeof(GLchar) * info_log_length);
|
||||
GLchar *info_log_text = (GLchar *) malloc(sizeof(GLchar) * info_log_length);
|
||||
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderInfoLog(id, info_log_length, NULL, info_log_text);
|
||||
else
|
||||
glGetProgramInfoLog(id, info_log_length, NULL, info_log_text);
|
||||
if (build_target != OPENGL_BUILD_TARGET_LINK)
|
||||
glGetShaderInfoLog(id, info_log_length, NULL, info_log_text);
|
||||
else
|
||||
glGetProgramInfoLog(id, info_log_length, NULL, info_log_text);
|
||||
|
||||
const char* reason = NULL;
|
||||
const char *reason = NULL;
|
||||
|
||||
switch (build_target)
|
||||
{
|
||||
case OPENGL_BUILD_TARGET_VERTEX:
|
||||
reason = "compiling vertex shader";
|
||||
break;
|
||||
case OPENGL_BUILD_TARGET_FRAGMENT:
|
||||
reason = "compiling fragment shader";
|
||||
break;
|
||||
case OPENGL_BUILD_TARGET_LINK:
|
||||
reason = "linking shader program";
|
||||
break;
|
||||
}
|
||||
switch (build_target) {
|
||||
case OPENGL_BUILD_TARGET_VERTEX:
|
||||
reason = "compiling vertex shader";
|
||||
break;
|
||||
case OPENGL_BUILD_TARGET_FRAGMENT:
|
||||
reason = "compiling fragment shader";
|
||||
break;
|
||||
case OPENGL_BUILD_TARGET_LINK:
|
||||
reason = "linking shader program";
|
||||
break;
|
||||
}
|
||||
|
||||
/* Shader compilation log can be lengthy, mark begin and end */
|
||||
const char* line = "--------------------";
|
||||
/* Shader compilation log can be lengthy, mark begin and end */
|
||||
const char *line = "--------------------";
|
||||
|
||||
pclog("OpenGL: Error when %s in %s:\n%sBEGIN%s\n%s\n%s END %s\n", reason, shader_path, line, line, info_log_text, line, line);
|
||||
pclog("OpenGL: Error when %s in %s:\n%sBEGIN%s\n%s\n%s END %s\n", reason, shader_path, line, line, info_log_text, line, line);
|
||||
|
||||
free(info_log_text);
|
||||
free(info_log_text);
|
||||
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Compile custom shaders into a program.
|
||||
* @return Shader program identifier.
|
||||
*/
|
||||
GLuint load_custom_shaders(const char* path)
|
||||
*/
|
||||
GLuint
|
||||
load_custom_shaders(const char *path)
|
||||
{
|
||||
char* shader = read_file_to_string(path);
|
||||
char *shader = read_file_to_string(path);
|
||||
|
||||
if (shader != NULL)
|
||||
{
|
||||
int success = 1;
|
||||
if (shader != NULL) {
|
||||
int success = 1;
|
||||
|
||||
const char* vertex_sources[3] = { "#version 130\n", "#define VERTEX\n", shader };
|
||||
const char* fragment_sources[3] = { "#version 130\n", "#define FRAGMENT\n", shader };
|
||||
const char *vertex_sources[3] = { "#version 130\n", "#define VERTEX\n", shader };
|
||||
const char *fragment_sources[3] = { "#version 130\n", "#define FRAGMENT\n", shader };
|
||||
|
||||
/* Check if the shader program defines version directive */
|
||||
char* version_start = strstr(shader, "#version");
|
||||
/* Check if the shader program defines version directive */
|
||||
char *version_start = strstr(shader, "#version");
|
||||
|
||||
/* If the shader program contains a version directive,
|
||||
it must be captured and placed as the first statement. */
|
||||
if (version_start != NULL)
|
||||
{
|
||||
/* Version directive found, search the line end */
|
||||
char* version_end = strchr(version_start, '\n');
|
||||
/* If the shader program contains a version directive,
|
||||
it must be captured and placed as the first statement. */
|
||||
if (version_start != NULL) {
|
||||
/* Version directive found, search the line end */
|
||||
char *version_end = strchr(version_start, '\n');
|
||||
|
||||
if (version_end != NULL)
|
||||
{
|
||||
char version[30] = "";
|
||||
if (version_end != NULL) {
|
||||
char version[30] = "";
|
||||
|
||||
size_t version_len = MIN(version_end - version_start + 1, 29);
|
||||
size_t version_len = MIN(version_end - version_start + 1, 29);
|
||||
|
||||
strncat(version, version_start, version_len);
|
||||
strncat(version, version_start, version_len);
|
||||
|
||||
/* replace the default version directive */
|
||||
vertex_sources[0] = version;
|
||||
fragment_sources[0] = version;
|
||||
}
|
||||
/* replace the default version directive */
|
||||
vertex_sources[0] = version;
|
||||
fragment_sources[0] = version;
|
||||
}
|
||||
|
||||
/* Comment out the original version directive
|
||||
as only one is allowed. */
|
||||
memset(version_start, '/', 2);
|
||||
}
|
||||
/* Comment out the original version directive
|
||||
as only one is allowed. */
|
||||
memset(version_start, '/', 2);
|
||||
}
|
||||
|
||||
GLuint vertex_id = glCreateShader(GL_VERTEX_SHADER);
|
||||
GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
GLuint vertex_id = glCreateShader(GL_VERTEX_SHADER);
|
||||
GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
|
||||
glShaderSource(vertex_id, 3, vertex_sources, NULL);
|
||||
glCompileShader(vertex_id);
|
||||
success *= check_status(vertex_id, OPENGL_BUILD_TARGET_VERTEX, path);
|
||||
glShaderSource(vertex_id, 3, vertex_sources, NULL);
|
||||
glCompileShader(vertex_id);
|
||||
success *= check_status(vertex_id, OPENGL_BUILD_TARGET_VERTEX, path);
|
||||
|
||||
glShaderSource(fragment_id, 3, fragment_sources, NULL);
|
||||
glCompileShader(fragment_id);
|
||||
success *= check_status(fragment_id, OPENGL_BUILD_TARGET_FRAGMENT, path);
|
||||
glShaderSource(fragment_id, 3, fragment_sources, NULL);
|
||||
glCompileShader(fragment_id);
|
||||
success *= check_status(fragment_id, OPENGL_BUILD_TARGET_FRAGMENT, path);
|
||||
|
||||
free(shader);
|
||||
free(shader);
|
||||
|
||||
GLuint prog_id = 0;
|
||||
GLuint prog_id = 0;
|
||||
|
||||
if (success)
|
||||
{
|
||||
prog_id = glCreateProgram();
|
||||
if (success) {
|
||||
prog_id = glCreateProgram();
|
||||
|
||||
glAttachShader(prog_id, vertex_id);
|
||||
glAttachShader(prog_id, fragment_id);
|
||||
glLinkProgram(prog_id);
|
||||
check_status(prog_id, OPENGL_BUILD_TARGET_LINK, path);
|
||||
glAttachShader(prog_id, vertex_id);
|
||||
glAttachShader(prog_id, fragment_id);
|
||||
glLinkProgram(prog_id);
|
||||
check_status(prog_id, OPENGL_BUILD_TARGET_LINK, path);
|
||||
|
||||
glDetachShader(prog_id, vertex_id);
|
||||
glDetachShader(prog_id, fragment_id);
|
||||
}
|
||||
glDetachShader(prog_id, vertex_id);
|
||||
glDetachShader(prog_id, fragment_id);
|
||||
}
|
||||
|
||||
glDeleteShader(vertex_id);
|
||||
glDeleteShader(fragment_id);
|
||||
glDeleteShader(vertex_id);
|
||||
glDeleteShader(fragment_id);
|
||||
|
||||
return prog_id;
|
||||
}
|
||||
return 0;
|
||||
return prog_id;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Compile default shaders into a program.
|
||||
* @return Shader program identifier.
|
||||
*/
|
||||
GLuint load_default_shaders()
|
||||
*/
|
||||
GLuint
|
||||
load_default_shaders()
|
||||
{
|
||||
GLuint vertex_id = glCreateShader(GL_VERTEX_SHADER);
|
||||
GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
GLuint vertex_id = glCreateShader(GL_VERTEX_SHADER);
|
||||
GLuint fragment_id = glCreateShader(GL_FRAGMENT_SHADER);
|
||||
|
||||
glShaderSource(vertex_id, 1, &vertex_shader, NULL);
|
||||
glCompileShader(vertex_id);
|
||||
glShaderSource(vertex_id, 1, &vertex_shader, NULL);
|
||||
glCompileShader(vertex_id);
|
||||
|
||||
glShaderSource(fragment_id, 1, &fragment_shader, NULL);
|
||||
glCompileShader(fragment_id);
|
||||
glShaderSource(fragment_id, 1, &fragment_shader, NULL);
|
||||
glCompileShader(fragment_id);
|
||||
|
||||
GLuint prog_id = glCreateProgram();
|
||||
GLuint prog_id = glCreateProgram();
|
||||
|
||||
glAttachShader(prog_id, vertex_id);
|
||||
glAttachShader(prog_id, fragment_id);
|
||||
glAttachShader(prog_id, vertex_id);
|
||||
glAttachShader(prog_id, fragment_id);
|
||||
|
||||
glLinkProgram(prog_id);
|
||||
glLinkProgram(prog_id);
|
||||
|
||||
glDetachShader(prog_id, vertex_id);
|
||||
glDetachShader(prog_id, fragment_id);
|
||||
glDetachShader(prog_id, vertex_id);
|
||||
glDetachShader(prog_id, fragment_id);
|
||||
|
||||
glDeleteShader(vertex_id);
|
||||
glDeleteShader(fragment_id);
|
||||
glDeleteShader(vertex_id);
|
||||
glDeleteShader(fragment_id);
|
||||
|
||||
return prog_id;
|
||||
return prog_id;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user