aboutsummaryrefslogtreecommitdiffstats
path: root/emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-05-30 15:24:06 -0700
committerJesse Hall <jessehall@google.com>2012-06-06 09:39:32 -0700
commit3d1eacc2a657b024587bbf6f369f073c4daa36be (patch)
treeabba23f534e16ced6f64cd386c00328567db56eb /emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp
parent455038d1740083aa5e2b5b0ec852cd81bcc9ce1e (diff)
downloadsdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.zip
sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.gz
sdk-3d1eacc2a657b024587bbf6f369f073c4daa36be.tar.bz2
Move emugl system code to development.git
Because of the way the SDK and Android system images are branched, host code that goes into the SDK tools can't live in the same repository as code that goes into the system image. This change keeps the emugl host code in sdk.git/emulator/opengl while moving the emugl system code to development.git/tools/emulator/opengl. A few changes were made beyond simply cloning the directories: (a) Makefiles were modified to only build the relevant components. Not doing so would break the build due to having multiple rule definitions. (b) Protocol spec files were moved from the guest encoder directories to the host decoder directories. The decoder must support older versions of the protocol, but not newer versions, so it makes sense to keep the latest version of the protocol spec with the decoder. (c) Along with that, the encoder is now built from checked in generated encoder source rather than directly from the protocol spec. The generated code must be updated manually. This makes it possible to freeze the system encoder version without freezing the host decoder version, and also makes it very obvious when a protocol changes is happening that will require special backwards-compatibility support in the decoder/renderer. (d) Host-only and system-only code were removed from the repository where they aren't used. (e) README and DESIGN documents were updated to reflect this split. No actual source code was changed due to the above. Change-Id: I70b576a70ac3dc94155f931508b152178f1e8cd5
Diffstat (limited to 'emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp')
-rw-r--r--emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp39
1 files changed, 0 insertions, 39 deletions
diff --git a/emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp b/emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp
deleted file mode 100644
index 57d65c0..0000000
--- a/emulator/opengl/system/GLESv2_enc/GL2EncoderUtils.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* 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 <stdio.h>
-#include <stdlib.h>
-#include "GL2Encoder.h"
-#include <assert.h>
-
-size_t pixelDataSize(void *self, GLsizei width, GLsizei height, GLenum format, GLenum type, int pack)
-{
- GL2Encoder *ctx = (GL2Encoder *)self;
- assert (ctx->state() != NULL);
- return ctx->state()->pixelDataSize(width, height, format, type, pack);
-}
-
-size_t pixelDataSize3D(void *self, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, int pack)
-{
- size_t layerSize = pixelDataSize(self, width, height, format, type, pack);
- return layerSize * depth;
-}
-
-GLenum uniformType(void * self, GLuint program, GLint location)
-{
- GL2Encoder * ctx = (GL2Encoder *) self;
- assert (ctx->shared() != NULL);
- return ctx->shared()->getProgramUniformType(program, location);
-}