Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lower GLSL version requirement

Browse Source 
I didn't really use any of the newer features anyway.
This should accomodate open source drivers that use older versions of MESA.
This commit is contained in:
Peter Tissen 2015-08-13 10:46:48 +02:00
parent 93615736af
commit f0b87c99ab
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/itdelatrisu/opsu/objects/curves/Curve.java
View File

@ -87,12 +87,12 @@ public abstract class Curve {
Curve.borderColor = borderColor; Curve.borderColor = borderColor;
ContextCapabilities capabilities = GLContext.getCapabilities(); ContextCapabilities capabilities = GLContext.getCapabilities();
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL33; mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL30;
if (mmsliderSupported) if (mmsliderSupported)
CurveRenderState.init(width, height, circleSize); CurveRenderState.init(width, height, circleSize);
else { else {
if (Options.getSkin().getSliderStyle() != Skin.STYLE_PEPPYSLIDER) if (Options.getSkin().getSliderStyle() != Skin.STYLE_PEPPYSLIDER)
Log.warn("New slider style requires FBO support and OpenGL 3.2."); Log.warn("New slider style requires FBO support and OpenGL 3.0.");
} }
} }

11
src/itdelatrisu/opsu/render/CurveRenderState.java
View File

@ -409,10 +409,10 @@ public class CurveRenderState {
program = GL20.glCreateProgram(); program = GL20.glCreateProgram();
int vtxShdr = GL20.glCreateShader(GL20.GL_VERTEX_SHADER); int vtxShdr = GL20.glCreateShader(GL20.GL_VERTEX_SHADER);
int frgShdr = GL20.glCreateShader(GL20.GL_FRAGMENT_SHADER); int frgShdr = GL20.glCreateShader(GL20.GL_FRAGMENT_SHADER);
GL20.glShaderSource(vtxShdr, "#version 330\n" GL20.glShaderSource(vtxShdr, "#version 130\n"
+ "\n" + "\n"
+ "layout(location = 0) in vec4 in_position;\n" + "in vec4 in_position;\n"
+ "layout(location = 1) in vec2 in_tex_coord;\n" + "in vec2 in_tex_coord;\n"
+ "\n" + "\n"
+ "out vec2 tex_coord;\n" + "out vec2 tex_coord;\n"
+ "void main()\n" + "void main()\n"
@ -426,7 +426,7 @@ public class CurveRenderState {
String error = GL20.glGetShaderInfoLog(vtxShdr, 1024); String error = GL20.glGetShaderInfoLog(vtxShdr, 1024);
Log.error("Vertex Shader compilation failed.", new Exception(error)); Log.error("Vertex Shader compilation failed.", new Exception(error));
} }
GL20.glShaderSource(frgShdr, "#version 330\n" GL20.glShaderSource(frgShdr, "#version 130\n"
+ "\n" + "\n"
+ "uniform sampler1D tex;\n" + "uniform sampler1D tex;\n"
+ "uniform vec2 tex_size;\n" + "uniform vec2 tex_size;\n"
@ -434,7 +434,7 @@ public class CurveRenderState {
+ "uniform vec4 col_border;\n" + "uniform vec4 col_border;\n"
+ "\n" + "\n"
+ "in vec2 tex_coord;\n" + "in vec2 tex_coord;\n"
+ "layout(location = 0) out vec4 out_colour;\n" + "out vec4 out_colour;\n"
+ "\n" + "\n"
+ "void main()\n" + "void main()\n"
+ "{\n" + "{\n"
@ -451,6 +451,7 @@ public class CurveRenderState {
} }
GL20.glAttachShader(program, vtxShdr); GL20.glAttachShader(program, vtxShdr);
GL20.glAttachShader(program, frgShdr); GL20.glAttachShader(program, frgShdr);
GL30.glBindFragDataLocation(program, 0, "out_colour");
GL20.glLinkProgram(program); GL20.glLinkProgram(program);
res = GL20.glGetProgrami(program, GL20.GL_LINK_STATUS); res = GL20.glGetProgrami(program, GL20.GL_LINK_STATUS);
if (res != GL11.GL_TRUE) { if (res != GL11.GL_TRUE) {