sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added the shader's sources to the Logger's Info. It is a bit more verbose, but should help identify where it's coming from. Whereas before you were only getting the "Uniform"'s name that it couldn't find, now it'll tell you in which shader it is.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8158 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
dan..om 2011-09-03 10:30:21 +00:00
parent b34a3c02e1
commit df7d2684fd
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engine/src/lwjgl-ogl/com/jme3/renderer/lwjgl/LwjglRenderer.java
View File

@ -456,11 +456,11 @@ public class LwjglRenderer implements Renderer {
bits = GL_COLOR_BUFFER_BIT; bits = GL_COLOR_BUFFER_BIT;
} }
if (depth) { if (depth) {
//glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false //glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false
//here s some link on openl board //here s some link on openl board
//http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223 //http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223
//if depth clear is requested, we enable the depthMask //if depth clear is requested, we enable the depthMask
if (context.depthWriteEnabled == false) { if (context.depthWriteEnabled == false) {
glDepthMask(true); glDepthMask(true);
context.depthWriteEnabled = true; context.depthWriteEnabled = true;
@ -478,7 +478,7 @@ public class LwjglRenderer implements Renderer {
public void setBackgroundColor(ColorRGBA color) { public void setBackgroundColor(ColorRGBA color) {
glClearColor(color.r, color.g, color.b, color.a); glClearColor(color.r, color.g, color.b, color.a);
} }
public void setAlphaToCoverage(boolean value) { public void setAlphaToCoverage(boolean value) {
if (value) { if (value) {
glEnable(ARBMultisample.GL_SAMPLE_ALPHA_TO_COVERAGE_ARB); glEnable(ARBMultisample.GL_SAMPLE_ALPHA_TO_COVERAGE_ARB);
@ -531,7 +531,7 @@ public class LwjglRenderer implements Renderer {
} }
if (state.isPointSprite() && !context.pointSprite) { if (state.isPointSprite() && !context.pointSprite) {
// Only enable/disable sprite // Only enable/disable sprite
if (context.boundTextures[0] != null){ if (context.boundTextures[0] != null){
if (context.boundTextureUnit != 0){ if (context.boundTextureUnit != 0){
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
@ -792,7 +792,7 @@ public class LwjglRenderer implements Renderer {
if (loc < 0) { if (loc < 0) {
uniform.setLocation(-1); uniform.setLocation(-1);
// uniform is not declared in shader // uniform is not declared in shader
logger.log(Level.INFO, "Uniform {0} is not declared in shader.", uniform.getName()); logger.log(Level.INFO, "Uniform {0} is not declared in shader {1}.", new Object[]{uniform.getName(), shader.getSources()});
} else { } else {
uniform.setLocation(loc); uniform.setLocation(loc);
} }
@ -1193,14 +1193,14 @@ public class LwjglRenderer implements Renderer {
logger.warning("Shader is not uploaded to GPU, cannot delete."); logger.warning("Shader is not uploaded to GPU, cannot delete.");
return; return;
} }
for (ShaderSource source : shader.getSources()) { for (ShaderSource source : shader.getSources()) {
if (source.getId() != -1) { if (source.getId() != -1) {
glDetachShader(shader.getId(), source.getId()); glDetachShader(shader.getId(), source.getId());
deleteShaderSource(source); deleteShaderSource(source);
} }
} }
// kill all references so sources can be collected // kill all references so sources can be collected
// if needed. // if needed.
shader.resetSources(); shader.resetSources();
@ -1453,7 +1453,7 @@ public class LwjglRenderer implements Renderer {
if (tex != null if (tex != null
&& tex.getMinFilter().usesMipMapLevels()) { && tex.getMinFilter().usesMipMapLevels()) {
setTexture(0, rb.getTexture()); setTexture(0, rb.getTexture());
int textureType = convertTextureType(tex.getType(), tex.getImage().getMultiSamples()); int textureType = convertTextureType(tex.getType(), tex.getImage().getMultiSamples());
glEnable(textureType); glEnable(textureType);
glGenerateMipmapEXT(textureType); glGenerateMipmapEXT(textureType);
@ -2331,7 +2331,7 @@ public class LwjglRenderer implements Renderer {
//IntMap<VertexBuffer> buffers = mesh.getBuffers(); //IntMap<VertexBuffer> buffers = mesh.getBuffers();
ArrayList<VertexBuffer> buffersList = mesh.getBufferList(); ArrayList<VertexBuffer> buffersList = mesh.getBufferList();
if (mesh.getNumLodLevels() > 0) { if (mesh.getNumLodLevels() > 0) {
indices = mesh.getLodLevel(lod); indices = mesh.getLodLevel(lod);
} else { } else {
@ -2341,7 +2341,7 @@ public class LwjglRenderer implements Renderer {
// VertexBuffer vb = entry.getValue(); // VertexBuffer vb = entry.getValue();
for (int i = 0; i < buffersList.size(); i++){ for (int i = 0; i < buffersList.size(); i++){
VertexBuffer vb = buffersList.get(i); VertexBuffer vb = buffersList.get(i);
if (vb.getBufferType() == Type.InterleavedData if (vb.getBufferType() == Type.InterleavedData
|| vb.getUsage() == Usage.CpuOnly // ignore cpu-only buffers || vb.getUsage() == Usage.CpuOnly // ignore cpu-only buffers
|| vb.getBufferType() == Type.Index) { || vb.getBufferType() == Type.Index) {
@ -2356,7 +2356,7 @@ public class LwjglRenderer implements Renderer {
setVertexAttrib(vb, interleavedData); setVertexAttrib(vb, interleavedData);
} }
} }
if (indices != null) { if (indices != null) {
drawTriangleList(indices, mesh, count); drawTriangleList(indices, mesh, count);
} else { } else {
@ -2370,7 +2370,7 @@ public class LwjglRenderer implements Renderer {
if (mesh.getVertexCount() == 0) { if (mesh.getVertexCount() == 0) {
return; return;
} }
if (context.pointSprite && mesh.getMode() != Mode.Points){ if (context.pointSprite && mesh.getMode() != Mode.Points){
// XXX: Hack, disable point sprite mode if mesh not in point mode // XXX: Hack, disable point sprite mode if mesh not in point mode
if (context.boundTextures[0] != null){ if (context.boundTextures[0] != null){
@ -2383,7 +2383,7 @@ public class LwjglRenderer implements Renderer {
context.pointSprite = false; context.pointSprite = false;
} }
} }
if (context.pointSize != mesh.getPointSize()) { if (context.pointSize != mesh.getPointSize()) {
glPointSize(mesh.getPointSize()); glPointSize(mesh.getPointSize());
context.pointSize = mesh.getPointSize(); context.pointSize = mesh.getPointSize();