opengl : fix. wrong extract parameter logic that check hex value

Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
Change-Id: I0789f724ea2ab261b4ef464e0bd872fea5c38554

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLCommonStateDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLCommonStateDataMaker.java
index c05689d..4f89004 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLCommonStateDataMaker.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLCommonStateDataMaker.java
@@ -150,10 +150,12 @@ public class GLCommonStateDataMaker {
                        return;
                }
 
-               if (parameters[0].equals(GLAPINameDefine.GL_PACK_ALIGNMENT)) {
+               if (parameters[0].equals(Long.toString(AnalyzerUtil
+                               .addrToLong(GLAPINameDefine.GL_PACK_ALIGNMENT)))) {
                        getStateDataManager().updateStateAtCurrentContext(
                                        GLContextNameEnum.PACK_ALIGN.ordinal(), Integer.parseInt(parameters[1]));
-               } else if (parameters[0].equals(GLAPINameDefine.GL_UNPACK_ALIGNMENT)) {
+               } else if (parameters[0].equals(Long.toString(AnalyzerUtil
+                               .addrToLong(GLAPINameDefine.GL_UNPACK_ALIGNMENT)))) {
                        getStateDataManager().updateStateAtCurrentContext(
                                        GLContextNameEnum.UNPACK_ALIGN.ordinal(), Integer.parseInt(parameters[1]));
                } else {
@@ -295,7 +297,8 @@ public class GLCommonStateDataMaker {
                                return;
                        }
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.CULLING_ORIENTATION.ordinal(), Integer.parseInt(parameters[0]));
+                                       GLContextNameEnum.CULLING_ORIENTATION.ordinal(),
+                                       Integer.parseInt(parameters[0]));
                }
 
        }
@@ -425,19 +428,23 @@ public class GLCommonStateDataMaker {
                                DA_LOG.error("GL extract API parameter  : " + GLAPINameDefine.API_GL_BLEND_EQ);
                                return;
                        }
+                       getStateDataManager()
+                                       .updateStateAtCurrentContext(GLContextNameEnum.BLEND_EQUATION_RGB.ordinal(),
+                                                       Integer.parseInt(parameters[0]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.BLEND_EQUATION_RGB.ordinal(), Integer.parseInt(parameters[0]));
-                       getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.BLEND_EQUATION_ALPHA.ordinal(), Integer.parseInt(parameters[0]));
+                                       GLContextNameEnum.BLEND_EQUATION_ALPHA.ordinal(),
+                                       Integer.parseInt(parameters[0]));
                } else if (logData.getApiName().equals(GLAPINameDefine.API_GL_BLEND_EQ_SEP)) {
                        if (parameters.length != 2) {
                                DA_LOG.error("GL extract API parameter  : " + GLAPINameDefine.API_GL_BLEND_EQ_SEP);
                                return;
                        }
+                       getStateDataManager()
+                                       .updateStateAtCurrentContext(GLContextNameEnum.BLEND_EQUATION_RGB.ordinal(),
+                                                       Integer.parseInt(parameters[0]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.BLEND_EQUATION_RGB.ordinal(), Integer.parseInt(parameters[0]));
-                       getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.BLEND_EQUATION_ALPHA.ordinal(), Integer.parseInt(parameters[1]));
+                                       GLContextNameEnum.BLEND_EQUATION_ALPHA.ordinal(),
+                                       Integer.parseInt(parameters[1]));
                } else if (logData.getApiName().equals(GLAPINameDefine.API_GL_BLEND_FUNC)) {
                        if (parameters.length != 2) {
                                DA_LOG.error("GL extract API parameter  : " + GLAPINameDefine.API_GL_BLEND_FUNC);
@@ -477,12 +484,14 @@ public class GLCommonStateDataMaker {
                                DA_LOG.error("GL extract API parameter  : " + GLAPINameDefine.API_GL_STENCIL_FUNC);
                                return;
                        }
-                       getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(), Integer.parseInt(parameters[0]));
+                       getStateDataManager()
+                                       .updateStateAtCurrentContext(GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(),
+                                                       Integer.parseInt(parameters[0]));
                        getStateDataManager().updateStateAtCurrentContext(
                                        GLContextNameEnum.STENCIL_FRONT_REF.ordinal(), Integer.parseInt(parameters[1]));
-                       getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(), Integer.parseInt(parameters[2]));
+                       getStateDataManager()
+                                       .updateStateAtCurrentContext(GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(),
+                                                       Integer.parseInt(parameters[2]));
 
                        getStateDataManager().updateStateAtCurrentContext(
                                        GLContextNameEnum.STENCIL_BACK_FUNC.ordinal(), Integer.parseInt(parameters[0]));
@@ -498,31 +507,43 @@ public class GLCommonStateDataMaker {
                        }
                        if (parameters[0].equals(GLAPINameDefine.GL_FRONT)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(), Integer.parseInt(parameters[0]));
+                                               GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(),
+                                               Integer.parseInt(parameters[0]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_REF.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_FRONT_REF.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                        } else if (parameters[0].equals(GLAPINameDefine.GL_BACK)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_FUNC.ordinal(), Integer.parseInt(parameters[0]));
+                                               GLContextNameEnum.STENCIL_BACK_FUNC.ordinal(),
+                                               Integer.parseInt(parameters[0]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_REF.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_BACK_REF.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_MASK.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_BACK_MASK.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                        } else if (parameters[0].equals(GLAPINameDefine.GL_FRONT_AND_BACK)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(), Integer.parseInt(parameters[0]));
+                                               GLContextNameEnum.STENCIL_FRONT_FUNC.ordinal(),
+                                               Integer.parseInt(parameters[0]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_REF.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_FRONT_REF.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_FRONT_MASK.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_FUNC.ordinal(), Integer.parseInt(parameters[0]));
+                                               GLContextNameEnum.STENCIL_BACK_FUNC.ordinal(),
+                                               Integer.parseInt(parameters[0]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_REF.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_BACK_REF.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_MASK.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_BACK_MASK.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                        }
                } else if (logData.getApiName().equals(GLAPINameDefine.API_GL_STENCIL_OP)) {
                        if (parameters.length != 3) {
@@ -530,17 +551,23 @@ public class GLCommonStateDataMaker {
                                return;
                        }
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(), Integer.parseInt(parameters[0]));
+                                       GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(),
+                                       Integer.parseInt(parameters[0]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                       GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(),
+                                       Integer.parseInt(parameters[1]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(), Integer.parseInt(parameters[2]));
+                                       GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(),
+                                       Integer.parseInt(parameters[2]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(), Integer.parseInt(parameters[0]));
+                                       GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(),
+                                       Integer.parseInt(parameters[0]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                       GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(),
+                                       Integer.parseInt(parameters[1]));
                        getStateDataManager().updateStateAtCurrentContext(
-                                       GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(), Integer.parseInt(parameters[2]));
+                                       GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(),
+                                       Integer.parseInt(parameters[2]));
                } else if (logData.getApiName().equals(GLAPINameDefine.API_GL_STENCIL_OP_SEP)) {
                        if (parameters.length != 4) {
                                DA_LOG.error("GL extract API parameter  : " + logData.getApiName());
@@ -548,31 +575,43 @@ public class GLCommonStateDataMaker {
                        }
                        if (parameters[0].equals(GLAPINameDefine.GL_FRONT)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(), Integer.parseInt(parameters[3]));
+                                               GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(),
+                                               Integer.parseInt(parameters[3]));
                        } else if (parameters[0].equals(GLAPINameDefine.GL_BACK)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(), Integer.parseInt(parameters[3]));
+                                               GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(),
+                                               Integer.parseInt(parameters[3]));
                        } else if (parameters[0].equals(GLAPINameDefine.GL_FRONT_AND_BACK)) {
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_FRONT_S_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_FRONT_D_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(), Integer.parseInt(parameters[3]));
+                                               GLContextNameEnum.STENCIL_FRONT_D_PASS.ordinal(),
+                                               Integer.parseInt(parameters[3]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(), Integer.parseInt(parameters[1]));
+                                               GLContextNameEnum.STENCIL_BACK_S_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[1]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(), Integer.parseInt(parameters[2]));
+                                               GLContextNameEnum.STENCIL_BACK_D_FAIL.ordinal(),
+                                               Integer.parseInt(parameters[2]));
                                getStateDataManager().updateStateAtCurrentContext(
-                                               GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(), Integer.parseInt(parameters[3]));
+                                               GLContextNameEnum.STENCIL_BACK_D_PASS.ordinal(),
+                                               Integer.parseInt(parameters[3]));
                        }
                }
        }