From: Kimmo Hoikka Date: Mon, 16 Oct 2017 14:14:59 +0000 (+0000) Subject: Merge "Ensure we discard unneeded renderbuffers in OpenGL ES 2.0 as well" into devel... X-Git-Tag: dali_1.2.62~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=b24ed08bdc8fca1cdf0e927486ecccd0ca387fdf;hp=96a165a63ef2c335330c1c9ee7b22227d55e5322 Merge "Ensure we discard unneeded renderbuffers in OpenGL ES 2.0 as well" into devel/master --- diff --git a/adaptors/common/gl/gl-implementation.h b/adaptors/common/gl/gl-implementation.h index 452367e..36a08cc 100644 --- a/adaptors/common/gl/gl-implementation.h +++ b/adaptors/common/gl/gl-implementation.h @@ -2,7 +2,7 @@ #define __DALI_INTERNAL_GL_IMPLEMENTATION_H__ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1509,9 +1509,9 @@ public: void InvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments) { #if DALI_GLES_VERSION >= 30 - // if OpenGL ES 2.0 compatibility is need this can be implemented with - // glDiscardFramebufferEXT glInvalidateFramebuffer(target,numAttachments,attachments); +#else + mGlExtensions.DiscardFrameBuffer(target, numAttachments, attachments); #endif // DALI_GLES_VERSION >= 30 }