Revert "Forgot to fix a particle shader for hd3000"
This reverts commit 48fcea8ee8
.
This commit is contained in:
parent
48fcea8ee8
commit
e77b5dddeb
@ -1,4 +1,3 @@
|
||||
#if __VERSION__ >= 330
|
||||
layout(location=0) in vec3 Position;
|
||||
layout(location = 1) in float lifetime;
|
||||
layout(location = 2) in float size;
|
||||
@ -8,17 +7,6 @@ layout(location = 4) in vec2 quadcorner;
|
||||
|
||||
layout(location = 5) in vec3 rotationvec;
|
||||
layout(location = 6) in float anglespeed;
|
||||
#else
|
||||
in vec3 Position;
|
||||
in float lifetime;
|
||||
in float size;
|
||||
|
||||
in vec2 Texcoord;
|
||||
in vec2 quadcorner;
|
||||
|
||||
in vec3 rotationvec;
|
||||
float anglespeed;
|
||||
#endif
|
||||
|
||||
out float lf;
|
||||
out vec2 tc;
|
||||
|
@ -217,8 +217,6 @@ void setAttribute(AttributeType Tp, GLuint ProgramID)
|
||||
glBindAttribLocation(ProgramID, 1, "lifetime");
|
||||
glBindAttribLocation(ProgramID, 2, "size");
|
||||
glBindAttribLocation(ProgramID, 4, "quadcorner");
|
||||
glBindAttribLocation(ProgramID, 5, "rotationvec");
|
||||
glBindAttribLocation(ProgramID, 6, "anglespeed");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -504,7 +504,7 @@ void IrrDriver::initDevice()
|
||||
hasComputeShaders = false;
|
||||
hasTextureStorage = false;
|
||||
// Default false value for hasVSLayer if --no-graphics argument is used
|
||||
/*#if !defined(__APPLE__)
|
||||
#if !defined(__APPLE__)
|
||||
if (!ProfileWorld::isNoGraphics())
|
||||
{
|
||||
if (hasGLExtension("GL_AMD_vertex_shader_layer")) {
|
||||
@ -532,7 +532,7 @@ void IrrDriver::initDevice()
|
||||
Log::info("GLDriver", "ARB Texture Storage enabled");
|
||||
}
|
||||
}
|
||||
#endif*/
|
||||
#endif
|
||||
|
||||
|
||||
// This remaps the window, so it has to be done before the clear to avoid flicker
|
||||
|
@ -283,7 +283,6 @@ public:
|
||||
|
||||
unsigned getGLSLVersion() const
|
||||
{
|
||||
return 140;
|
||||
if (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion == 3))
|
||||
return GLMajorVersion * 100 + GLMinorVersion * 10;
|
||||
else if (GLMajorVersion == 3)
|
||||
|
Loading…
Reference in New Issue
Block a user