Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3efd03a3 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "remove copybit hack from software opengl (libagl)" into gingerbread

parents 6e6cc201 bb0628d9

opengl/libagl/Android.mk

+0 −10
Original line number Original line Diff line number Diff line
@@ -6,9 +6,6 @@ LOCAL_PATH:= $(call my-dir) 




include $(CLEAR_VARS)

include $(CLEAR_VARS)





# Set to 1 to use gralloc and copybits

LIBAGL_USE_GRALLOC_COPYBITS := 1



LOCAL_SRC_FILES:= \

LOCAL_SRC_FILES:= \

	egl.cpp                     \

	egl.cpp                     \

	state.cpp		            \

	state.cpp		            \
@@ -51,13 +48,6 @@ ifneq ($(TARGET_SIMULATOR),true) 
    LOCAL_C_INCLUDES += bionic/libc/private

    LOCAL_C_INCLUDES += bionic/libc/private

endif

endif





ifeq ($(LIBAGL_USE_GRALLOC_COPYBITS),1)

    LOCAL_CFLAGS += -DLIBAGL_USE_GRALLOC_COPYBITS

    LOCAL_SRC_FILES += copybit.cpp

    LOCAL_SHARED_LIBRARIES += libui

endif





LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl

LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl

LOCAL_MODULE:= libGLES_android

LOCAL_MODULE:= libGLES_android

opengl/libagl/TextureObjectManager.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -55,9 +55,6 @@ void EGLTextureObject::init() 
    memset(crop_rect, 0, sizeof(crop_rect));

    memset(crop_rect, 0, sizeof(crop_rect));

    generate_mipmap = GL_FALSE;

    generate_mipmap = GL_FALSE;

    direct = GL_FALSE;

    direct = GL_FALSE;

#ifdef LIBAGL_USE_GRALLOC_COPYBITS

    try_copybit = false;

#endif // LIBAGL_USE_GRALLOC_COPYBITS

    buffer = 0;

    buffer = 0;

}

}

opengl/libagl/TextureObjectManager.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -80,9 +80,6 @@ public: 
    GLint               crop_rect[4];

    GLint               crop_rect[4];

    GLint               generate_mipmap;

    GLint               generate_mipmap;

    GLint               direct;

    GLint               direct;

#ifdef LIBAGL_USE_GRALLOC_COPYBITS

    bool                try_copybit;

#endif // LIBAGL_USE_GRALLOC_COPYBITS

    android_native_buffer_t* buffer;

    android_native_buffer_t* buffer;

};

};

opengl/libagl/array.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -26,9 +26,6 @@ 
#include "primitives.h"

#include "primitives.h"

#include "texture.h"

#include "texture.h"

#include "BufferObjectManager.h"

#include "BufferObjectManager.h"

#ifdef LIBAGL_USE_GRALLOC_COPYBITS

#include "copybit.h"

#endif // LIBAGL_USE_GRALLOC_COPYBITS





// ----------------------------------------------------------------------------

// ----------------------------------------------------------------------------
@@ -707,12 +704,6 @@ void drawPrimitivesTriangleStrip(ogles_context_t* c, 




void drawPrimitivesTriangleFan(ogles_context_t* c,

void drawPrimitivesTriangleFan(ogles_context_t* c,

        GLint first, GLsizei count) {

        GLint first, GLsizei count) {

#ifdef LIBAGL_USE_GRALLOC_COPYBITS

    if (drawTriangleFanWithCopybit(c, first, count)) {

        return;

    }

#endif // LIBAGL_USE_GRALLOC_COPYBITS



    drawPrimitivesTriangleFanOrStrip(c, first, count, 2);

    drawPrimitivesTriangleFanOrStrip(c, first, count, 2);

}

}

opengl/libagl/copybit.cpp

deleted100644 → 0
+0 −618

File deleted.

Preview size limit exceeded, changes collapsed.