Merge "emulator Opengl - slight type change for GLESv2"

2011-05-03 05:44:15 -07:00
parent d8bbe0ce83 139308015e
commit 351c4d55b7
1 changed files with 2 additions and 2 deletions
--- a/tools/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h
+++ b/tools/emulator/opengl/shared/OpenglCodecCommon/GLDecoderContextData.h
@@ -51,13 +51,13 @@ public:
        delete m_pointerData;
    }

-    void storePointerData(PointerDataLocation loc, void *data, size_t len) {
+    void storePointerData(unsigned int loc, void *data, size_t len) {

        assert(loc < m_nLocations);
        m_pointerData[loc].alloc(len);
        memcpy(m_pointerData[loc].ptr(), data, len);
    }
-    void *pointerData(PointerDataLocation loc) {
+    void *pointerData(unsigned int loc) {
        assert(loc < m_nLocations);
        return m_pointerData[loc].ptr();
    }