Skip to content

Commit 1430089

Browse files
committed
Fix device info print in release mode.
1 parent 47f0a6b commit 1430089

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

library/src/main/jni/cge/common/cgeCommonDefine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const char* cgeGetVersion()
5353

5454
void cgePrintGLString(const char* name, GLenum em)
5555
{
56-
CGE_LOG_INFO("GL_INFO %s = %s\n", name, glGetString(em));
56+
CGE_LOG_KEEP("GL_INFO %s = %s\n", name, glGetString(em));
5757
}
5858

5959
const char* cgeGetBlendModeName(CGETextureBlendMode mode, bool withChinese)

library/src/main/jni/cge/common/cgeGlobal.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void cgeInitFilterStatus()
4545

4646
g_isFastFilterImpossible = (iParam < 300);
4747

48-
CGE_LOG_INFO("Use Fast Filter: %d\n", !g_isFastFilterImpossible);
48+
CGE_LOG_KEEP("Use Fast Filter: %d\n", !g_isFastFilterImpossible);
4949

5050
cgeCheckGLError("cgeInitFilterStatus - before 'GL_PIXEL_PACK_BUFFER'");
5151

@@ -74,7 +74,7 @@ bool cgeInitialize(int width, int height, CGEGlobalConfig::InitArguments arg)
7474

7575
if (arg == CGEGlobalConfig::CGE_INIT_LEAST)
7676
{
77-
CGE_LOG_INFO("You chosed CGE_INIT_LEAST for initialize, so the sprites could not be used! Once you used, unexpected problem would be happen\n");
77+
CGE_LOG_KEEP("You chosed CGE_INIT_LEAST for initialize, so the sprites could not be used! Once you used, unexpected problem would be happen\n");
7878
return true;
7979
}
8080

@@ -144,7 +144,7 @@ extern "C"
144144
{
145145
void cgePrintGLInfo()
146146
{
147-
CGE_LOG_INFO("===== Here are some information of your device =====\n\n");
147+
CGE_LOG_KEEP("===== Here are some information of your device =====\n\n");
148148

149149
cgePrintGLString("Vendor", GL_VENDOR);
150150
cgePrintGLString("Renderer", GL_RENDERER);
@@ -160,56 +160,56 @@ void cgePrintGLInfo()
160160
#ifdef GL_MAX_VERTEX_UNIFORM_COMPONENTS // GL Desktop
161161
glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS, iParam);
162162
#endif
163-
CGE_LOG_INFO("Max Vertex Uniform Vectors: %d\n", iParam[0]);
163+
CGE_LOG_KEEP("Max Vertex Uniform Vectors: %d\n", iParam[0]);
164164

165165
#ifdef GL_MAX_FRAGMENT_UNIFORM_VECTORS
166166
glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, iParam);
167167
#endif
168168
#ifdef GL_MAX_FRAGMENT_UNIFORM_COMPONENTS
169169
glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, iParam);
170170
#endif
171-
CGE_LOG_INFO("Max Fragment Uniform Vectors : %d\n", iParam[0]);
171+
CGE_LOG_KEEP("Max Fragment Uniform Vectors : %d\n", iParam[0]);
172172

173173
#ifdef GL_MAX_VARYING_VECTORS
174174
glGetIntegerv(GL_MAX_VARYING_VECTORS, iParam);
175175
#endif
176176
#ifdef GL_MAX_VARYING_COMPONENTS
177177
glGetIntegerv(GL_MAX_VARYING_COMPONENTS, iParam);
178178
#endif
179-
CGE_LOG_INFO("Max Varying Vectors: %d\n", iParam[0]);
179+
CGE_LOG_KEEP("Max Varying Vectors: %d\n", iParam[0]);
180180

181181
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, iParam);
182-
CGE_LOG_INFO("Max Texture Image Units : %d\n", iParam[0]);
182+
CGE_LOG_KEEP("Max Texture Image Units : %d\n", iParam[0]);
183183

184184
glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, iParam);
185-
CGE_LOG_INFO("Max Combined Texture Image Units : %d\n", iParam[0]);
185+
CGE_LOG_KEEP("Max Combined Texture Image Units : %d\n", iParam[0]);
186186

187187
glGetIntegerv(GL_MAX_TEXTURE_SIZE, iParam);
188-
CGE_LOG_INFO("Max Texture Size : %d\n", iParam[0]);
188+
CGE_LOG_KEEP("Max Texture Size : %d\n", iParam[0]);
189189

190190
glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, iParam);
191-
CGE_LOG_INFO("Max Vertex Attribs: %d\n", iParam[0]);
191+
CGE_LOG_KEEP("Max Vertex Attribs: %d\n", iParam[0]);
192192

193193
glGetIntegerv(GL_MAX_VIEWPORT_DIMS, iParam);
194-
CGE_LOG_INFO("Max Viewport Dims : [%d, %d]\n", iParam[0], iParam[1]);
194+
CGE_LOG_KEEP("Max Viewport Dims : [%d, %d]\n", iParam[0], iParam[1]);
195195

196196
glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, iParam);
197-
CGE_LOG_INFO("Max Render Buffer Size: %d\n", iParam[0]);
197+
CGE_LOG_KEEP("Max Render Buffer Size: %d\n", iParam[0]);
198198

199199
glGetIntegerv(GL_STENCIL_BITS, iParam);
200-
CGE_LOG_INFO("Stencil Buffer Bits : %d\n", iParam[0]);
200+
CGE_LOG_KEEP("Stencil Buffer Bits : %d\n", iParam[0]);
201201

202202
glGetIntegerv(GL_ALIASED_POINT_SIZE_RANGE, iParam);
203-
CGE_LOG_INFO("Point Size Range: [%d, %d]\n", iParam[0], iParam[1]);
203+
CGE_LOG_KEEP("Point Size Range: [%d, %d]\n", iParam[0], iParam[1]);
204204

205205
glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, iParam);
206-
CGE_LOG_INFO("Line Width Range: [%d, %d]\n", iParam[0], iParam[1]);
206+
CGE_LOG_KEEP("Line Width Range: [%d, %d]\n", iParam[0], iParam[1]);
207207

208208
glGetIntegerv(GL_DEPTH_BITS, iParam);
209-
CGE_LOG_INFO("Depth Bits: %d\n", iParam[0]);
209+
CGE_LOG_KEEP("Depth Bits: %d\n", iParam[0]);
210210

211211
cgeCheckGLError("cgePrintGLInfo");
212-
CGE_LOG_INFO("\n===== Information end =====\n\n");
212+
CGE_LOG_KEEP("\n===== Information end =====\n\n");
213213
}
214214

215215
const char* cgeQueryGLExtensions()

library/src/main/jni/cge/common/cgePlatform_ANDROID.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@
4444

4545
#if defined(_CGE_GENERAL_ERROR_TEST_) && _CGE_GENERAL_ERROR_TEST_
4646
#define CGE_UNEXPECTED_ERR_MSG(...) __VA_ARGS__
47-
// for important log msg
48-
#define CGE_LOG_KEEP(...) __android_log_print(ANDROID_LOG_WARN, CGE_LOG_TAG, __VA_ARGS__)
4947
#else
5048
#define CGE_UNEXPECTED_ERR_MSG(...)
5149
#endif
5250

51+
#ifndef CGE_LOG_KEEP
52+
// for important log msg
53+
#define CGE_LOG_KEEP(...) __android_log_print(ANDROID_LOG_WARN, CGE_LOG_TAG, __VA_ARGS__)
54+
#endif
55+
5356
#endif /* HTPLATFORMS_H_ */

vscode_tasks.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ function runAndroidApp() {
2626

2727
if . "$ADB_COMMAND" -d shell am start -n "$PACKAGE_NAME/$PACKAGE_NAME.$LAUNCH_ACTIVITY"; then
2828
if [[ -z "$(ps -ef | grep -i adb | grep -v grep | grep logcat)" ]]; then
29+
. "$ADB_COMMAND" -d logcat -c
2930
if [[ $(uname -s) == "Linux" ]] || [[ $(uname -s) == "Darwin" ]]; then
3031
APP_PROC_ID=$(adb shell ps | grep org.wysaid.cgeDemo | tr -s ' ' | cut -d' ' -f2)
3132
if [[ -n "$APP_PROC_ID" ]]; then

0 commit comments

Comments
 (0)