LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "opengles host: some order in host gl debugging"

Browse Source
This commit is contained in:
David Turner
2011-07-03 05:33:08 -07:00
committed by Android Code Review
parent b519642209 440eb6e594
commit 5d0b85f029
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/emulator/opengl/host/libs/GLESv1_dec/Android.mk
View File

@@ -12,4 +12,8 @@ LOCAL_SRC_FILES := GLDecoder.cpp
# for gl_types.h ! # for gl_types.h !
$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/system/GLESv1_enc) $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/system/GLESv1_enc)
#For gl debbuging
#$(call emugl-export,CFLAGS,-DCHECK_GL_ERROR)
#$(call emugl-export,CFLAGS,-DDEBUG_PRINTOUT)
$(call emugl-end-module) $(call emugl-end-module)

4
tools/emulator/opengl/host/libs/GLESv2_dec/Android.mk
View File

@@ -8,6 +8,10 @@ $(call emugl-gen-decoder,$(EMUGL_PATH)/system/GLESv2_enc,gl2)
$(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/system/GLESv2_enc) $(call emugl-export,C_INCLUDES,$(EMUGL_PATH)/system/GLESv2_enc)
$(call emugl-export,C_INCLUDES,$(LOCAL_PATH)) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH))
#For gl debbuging
#$(call emugl-export,CFLAGS,-DCHECK_GL_ERROR)
#$(call emugl-export,CFLAGS,-DDEBUG_PRINTOUT)
LOCAL_SRC_FILES := GL2Decoder.cpp LOCAL_SRC_FILES := GL2Decoder.cpp
$(call emugl-end-module) $(call emugl-end-module)

6
tools/emulator/opengl/host/libs/Translator/GLcommon/GLESvalidate.cpp
View File

@@ -7,7 +7,6 @@
bool GLESvalidate::textureEnum(GLenum e,unsigned int maxTex) { bool GLESvalidate::textureEnum(GLenum e,unsigned int maxTex) {
if (!((e >= GL_TEXTURE0) && (e <= (GL_TEXTURE0 + maxTex)))) ERR("GLESvalidate::textureEnum: e = 0x%X max %d\n", e, maxTex);
return e >= GL_TEXTURE0 && e <= (GL_TEXTURE0 + maxTex); return e >= GL_TEXTURE0 && e <= (GL_TEXTURE0 + maxTex);
} }
@@ -29,7 +28,6 @@ bool GLESvalidate::pixelType(GLEScontext * ctx, GLenum type) {
case GL_FLOAT: case GL_FLOAT:
return true; return true;
} }
ERR("Error: GLESvalidate::pixelType 0x%X\n", type);
return false; return false;
} }
@@ -57,7 +55,6 @@ bool GLESvalidate::pixelFrmt(GLEScontext* ctx ,GLenum format) {
case GL_LUMINANCE_ALPHA: case GL_LUMINANCE_ALPHA:
return true; return true;
} }
ERR("Error: GLESvalidate::pixelFrmt 0x%X\n", format);
return false; return false;
} }
@@ -107,8 +104,7 @@ bool GLESvalidate::textureTargetEx(GLenum target) {
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES: case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES:
case GL_TEXTURE_2D: case GL_TEXTURE_2D:
return true; return true;
} }
ERR("GLESvalidate::textureTargetEx 0x%X\n", target);
return false; return false;
} }

3
tools/emulator/opengl/host/libs/libOpenglRender/Android.mk
View File

@@ -47,6 +47,9 @@ LOCAL_C_INCLUDES += $(EMUGL_PATH)/host/libs/Translator/include
LOCAL_STATIC_LIBRARIES += libutils liblog LOCAL_STATIC_LIBRARIES += libutils liblog
#For gl debbuging
#$(call emugl-export,CFLAGS,-DCHECK_GL_ERROR)
$(call emugl-end-module) $(call emugl-end-module)
endif # HOST_OS != darwin endif # HOST_OS != darwin