jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1991 from jpark37/gl-improvements 

GL support improvements
master
Jim 2019-07-25 16:22:01 -07:00 committed by GitHub
parent 173eec0d6e a7ac33488c
commit f54fda4678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libobs-opengl/gl-shaderparser.c
View File

@ -167,7 +167,16 @@ static void gl_write_storage_var(struct gl_shader_parser *glsp,
if (st) {
gl_unwrap_storage_struct(glsp, st, var->name, input, prefix);
} else if (!input || strcmp(var->mapping, "VERTEXID")) {
} else {
if (input && (strcmp(var->mapping, "VERTEXID") == 0))
return;
if (strcmp(var->mapping, "POSITION") == 0) {
if (!input && (glsp->type == GS_SHADER_VERTEX))
return;
if (input && (glsp->type == GS_SHADER_PIXEL))
return;
}
struct gl_parser_attrib attrib;
gl_parser_attrib_init(&attrib);
@ -555,17 +564,23 @@ static void gl_write_main_storage_assign(struct gl_shader_parser *glsp,
dstr_free(&src_copy);
} else {
if (!dstr_is_empty(&dst_copy))
dstr_cat_dstr(&glsp->gl_string, &dst_copy);
dstr_cat(&glsp->gl_string, " = ");
if (input && (strcmp(var->mapping, "VERTEXID") == 0))
dstr_cat(&glsp->gl_string, "uint(gl_VertexID)");
else {
if (src)
dstr_cat(&glsp->gl_string, src);
dstr_cat(&glsp->gl_string, var->name);
if (input || (glsp->type != GS_SHADER_VERTEX) ||
(strcmp(var->mapping, "POSITION"))) {
if (!dstr_is_empty(&dst_copy))
dstr_cat_dstr(&glsp->gl_string, &dst_copy);
dstr_cat(&glsp->gl_string, " = ");
if (input && (strcmp(var->mapping, "VERTEXID") == 0))
dstr_cat(&glsp->gl_string, "uint(gl_VertexID)");
else if (input && (glsp->type == GS_SHADER_PIXEL) &&
(strcmp(var->mapping, "POSITION") == 0))
dstr_cat(&glsp->gl_string, "gl_FragCoord");
else {
if (src)
dstr_cat(&glsp->gl_string, src);
dstr_cat(&glsp->gl_string, var->name);
}
dstr_cat(&glsp->gl_string, ";\n");
}
dstr_cat(&glsp->gl_string, ";\n");
if (!input)
gl_write_main_interface_assign(glsp, var, src);
@ -654,12 +669,6 @@ static void gl_rename_attributes(struct gl_shader_parser *glsp)
size_t val;
if (attrib->input) {
if (strcmp(attrib->mapping, "VERTEXID") == 0) {
dstr_replace(&glsp->gl_string,
attrib->name.array, "gl_VertexID");
continue;
}
prefix = glsp->input_prefix;
val = input_idx++;
} else {

4
libobs-opengl/gl-subsystem.h
View File

@ -106,7 +106,7 @@ static inline GLenum convert_gs_internal_format(enum gs_color_format format)
case GS_RG32F:
return GL_RG32F;
case GS_R8G8:
return GL_R16;
return GL_RG8;
case GS_R16F:
return GL_R16F;
case GS_R32F:
@ -152,7 +152,7 @@ static inline GLenum get_gl_format_type(enum gs_color_format format)
case GS_RG32F:
return GL_FLOAT;
case GS_R8G8:
return GL_UNSIGNED_SHORT;
return GL_UNSIGNED_BYTE;
case GS_R16F:
return GL_UNSIGNED_SHORT;
case GS_R32F: