summaryrefslogtreecommitdiff
path: root/jni/feature_mos/src/mosaic_renderer/Renderer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'jni/feature_mos/src/mosaic_renderer/Renderer.cpp')
-rwxr-xr-xjni/feature_mos/src/mosaic_renderer/Renderer.cpp28
1 files changed, 19 insertions, 9 deletions
diff --git a/jni/feature_mos/src/mosaic_renderer/Renderer.cpp b/jni/feature_mos/src/mosaic_renderer/Renderer.cpp
index 93049cbd..c5c143f9 100755
--- a/jni/feature_mos/src/mosaic_renderer/Renderer.cpp
+++ b/jni/feature_mos/src/mosaic_renderer/Renderer.cpp
@@ -1,11 +1,25 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#include "Renderer.h"
-#include <GLES2/gl2ext.h>
+#include "mosaic/Log.h"
+#define LOG_TAG "Renderer"
-#include <android/log.h>
-#define LOG_TAG "Renderer"
-#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
-#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+#include <GLES2/gl2ext.h>
Renderer::Renderer()
: mGlProgram(0),
@@ -54,14 +68,12 @@ GLuint Renderer::createProgram(const char* pVertexSource, const char* pFragmentS
{
return 0;
}
- LOGI("VertexShader Loaded!");
GLuint pixelShader = loadShader(GL_FRAGMENT_SHADER, pFragmentSource);
if (!pixelShader)
{
return 0;
}
- LOGI("FragmentShader Loaded!");
GLuint program = glCreateProgram();
if (program)
@@ -71,8 +83,6 @@ GLuint Renderer::createProgram(const char* pVertexSource, const char* pFragmentS
glAttachShader(program, pixelShader);
checkGlError("glAttachShader");
- LOGI("Shaders Attached!");
-
glLinkProgram(program);
GLint linkStatus = GL_FALSE;
glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);