Attachment #180965 for bug #105876

View Details Raw Unified Return to Bug 105876

| Differences between



2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
        https://bugs.webkit.org/show_bug.cgi?id=105876

        Reviewed by Kenneth Rohde Christiansen.

        This is to sync the naming conventions of our classes in both EGL and GLX implementations. 
        In our GLX implementation, class responsible for the same functionality is named as GLXConfigSelector. 
        This patch renames EGLConfigHelper as EGLConfigSelector.

        * Source/cmake/OptionsEfl.cmake:

2012-12-27  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL][WebGL] Implement EGL support with GLX.



2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
        https://bugs.webkit.org/show_bug.cgi?id=105876

        Reviewed by Kenneth Rohde Christiansen.

        This is to sync the naming conventions of our classes in both EGL and GLX implementations. 
        In our GLX implementation, class responsible for the same functionality is named as GLXConfigSelector. 
        This patch renames EGLConfigHelper as EGLConfigSelector.

        * PlatformEfl.cmake:
        * platform/graphics/surfaces/egl/EGLConfigSelector.cpp: Renamed from Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.cpp.
        (WebCore):
        (WebCore::SharedEGLDisplay::deref):
        (WebCore::SharedEGLDisplay::sharedEGLDisplay):
        (WebCore::SharedEGLDisplay::SharedEGLDisplay):
        (WebCore::SharedEGLDisplay::cleanup):
        (WebCore::SharedEGLDisplay::~SharedEGLDisplay):
        (WebCore::EGLConfigSelector::EGLConfigSelector):
        (WebCore::EGLConfigSelector::~EGLConfigSelector):
        (WebCore::EGLConfigSelector::display):
        (WebCore::EGLConfigSelector::pBufferContextConfig):
        (WebCore::EGLConfigSelector::surfaceContextConfig):
        (WebCore::EGLConfigSelector::nativeVisualId):
        (WebCore::EGLConfigSelector::reset):
        (WebCore::EGLConfigSelector::createConfig):
        * platform/graphics/surfaces/egl/EGLConfigSelector.h: Renamed from Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.h.
        (WebCore):
        (SharedEGLDisplay):
        (WebCore::SharedEGLDisplay::create):
        (EGLConfigSelector):
        * platform/graphics/surfaces/egl/EGLSurface.cpp:
        (WebCore::EGLWindowTransportSurface::EGLWindowTransportSurface):
        (WebCore::EGLWindowTransportSurface::configuration):
        (WebCore::EGLWindowTransportSurface::destroy):
        * platform/graphics/surfaces/egl/EGLSurface.h:
        (EGLWindowTransportSurface):

2012-12-30  Philippe Normand  <pnormand@igalia.com>

        [GStreamer] webaudio/decode-audio-data-basic.html fails




    if (WTF_USE_EGL)
        list(APPEND WebCore_SOURCES
            platform/graphics/surfaces/egl/EGLConfigSelector.cpp
            platform/graphics/surfaces/egl/EGLContext.cpp
            platform/graphics/surfaces/egl/EGLSurface.cpp
        )
    endif ()




/*
 * Copyright (C) 2012 Intel Corporation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "EGLConfigHelper.h"

#if USE(EGL)

namespace WebCore {

SharedEGLDisplay* SharedEGLDisplay::m_staticSharedEGLDisplay = 0;

static EGLint configAttributeList[] = {
#if USE(OPENGL_ES_2)
    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
#else
    EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
#endif
    EGL_RED_SIZE, 8,
    EGL_GREEN_SIZE, 8,
    EGL_BLUE_SIZE, 8,
    EGL_STENCIL_SIZE, 8,
    EGL_ALPHA_SIZE, 8,
    EGL_SURFACE_TYPE, EGL_NONE,
    EGL_NONE
};

void SharedEGLDisplay::deref()
{
    if (derefBase()) {
        m_staticSharedEGLDisplay = 0;
        delete this;
    }
}

EGLDisplay SharedEGLDisplay::sharedEGLDisplay()
{
    return m_eglDisplay;
}

SharedEGLDisplay::SharedEGLDisplay(NativeSharedDisplay* display)
    : m_eglDisplay(EGL_NO_DISPLAY)
{
    if (display)
        m_eglDisplay = eglGetDisplay(reinterpret_cast<EGLNativeDisplayType>(display));
    else
        m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    if (m_eglDisplay == EGL_NO_DISPLAY) {
        LOG_ERROR("EGLDisplay Initialization failed.");
        return;
    }

    EGLBoolean success;
    success = eglInitialize(m_eglDisplay, 0, 0);

    if (success != EGL_TRUE) {
        LOG_ERROR("EGLInitialization failed.");
        m_eglDisplay = EGL_NO_DISPLAY;
    }

    success = eglBindAPI(eglAPIVersion);

    if (success != EGL_TRUE) {
        LOG_ERROR("Failed to set EGL API(%d).", eglGetError());
        m_eglDisplay = EGL_NO_DISPLAY;
    }
}

void SharedEGLDisplay::cleanup()
{
    if (m_eglDisplay == EGL_NO_DISPLAY)
        return;

    eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
    eglTerminate(m_eglDisplay);
    m_eglDisplay = EGL_NO_DISPLAY;
}

SharedEGLDisplay::~SharedEGLDisplay()
{
    cleanup();
}

EGLConfigHelper::EGLConfigHelper(NativeSharedDisplay* display)
    : m_pbufferFBConfig(0)
    , m_surfaceContextFBConfig(0)
{
    m_sharedDisplay = SharedEGLDisplay::create(display);
}

EGLConfigHelper::~EGLConfigHelper()
{
}

PlatformDisplay EGLConfigHelper::display()
{
    return m_sharedDisplay->sharedEGLDisplay();
}

EGLConfig EGLConfigHelper::pBufferContextConfig()
{
    if (!m_pbufferFBConfig) {
        configAttributeList[13] = EGL_PIXMAP_BIT;
        m_pbufferFBConfig = createConfig(configAttributeList);
    }

    return m_pbufferFBConfig;
}

EGLConfig EGLConfigHelper::surfaceContextConfig()
{
    if (!m_surfaceContextFBConfig) {
        configAttributeList[13] = EGL_WINDOW_BIT;
        m_surfaceContextFBConfig = createConfig(configAttributeList);
    }

    return m_surfaceContextFBConfig;
}

EGLint EGLConfigHelper::nativeVisualId(const EGLConfig& config)
{
    if (display() == EGL_NO_DISPLAY)
        return -1;

    EGLint eglValue = 0;
    eglGetConfigAttrib(display(), config, EGL_NATIVE_VISUAL_ID, &eglValue);

    return eglValue;
}

void EGLConfigHelper::reset()
{
    m_surfaceContextFBConfig = 0;
    m_pbufferFBConfig = 0;
}

EGLConfig EGLConfigHelper::createConfig(const int attributes[])
{
    if (display() == EGL_NO_DISPLAY)
        return 0;

    int numConfigs;
    EGLConfig config = 0;

    if (!eglChooseConfig(display(), attributes, &config, 1, &numConfigs))
        LOG_ERROR("Failed to get supported configirations.");

    if (numConfigs != 1) {
        LOG_ERROR("EGLChooseConfig didn't return exactly one config but (%d).", numConfigs);
        config = 0;
    }

    return config;
}

}

#endif



/*
 * Copyright (C) 2012 Intel Corporation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef EGLConfigHelper_h
#define EGLConfigHelper_h

#if USE(EGL)

#include <opengl/GLDefs.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>

namespace WebCore {

typedef Display NativeSharedDisplay;

class SharedEGLDisplay : public WTF::RefCountedBase {
    WTF_MAKE_NONCOPYABLE(SharedEGLDisplay);

public:
    static PassRefPtr<SharedEGLDisplay> create(NativeSharedDisplay* display)
    {
        if (!m_staticSharedEGLDisplay)
            m_staticSharedEGLDisplay = new SharedEGLDisplay(display);
        else
            m_staticSharedEGLDisplay->ref();

        return adoptRef(m_staticSharedEGLDisplay);
    }

    void deref();
    EGLDisplay sharedEGLDisplay();

protected:
    SharedEGLDisplay(NativeSharedDisplay*);
    void cleanup();
    virtual ~SharedEGLDisplay();

    static SharedEGLDisplay* m_staticSharedEGLDisplay;
    EGLDisplay m_eglDisplay;
};

class EGLConfigHelper {
    WTF_MAKE_NONCOPYABLE(EGLConfigHelper);

public:
    EGLConfigHelper(NativeSharedDisplay* = 0);
    virtual ~EGLConfigHelper();
    PlatformDisplay display();
    virtual EGLConfig pBufferContextConfig();
    virtual EGLConfig surfaceContextConfig();
    EGLint nativeVisualId(const EGLConfig&);
    void reset();

private:
    EGLConfig createConfig(const int attributes[]);

protected:
    EGLConfig m_pbufferFBConfig;
    EGLConfig m_surfaceContextFBConfig;
    RefPtr<SharedEGLDisplay> m_sharedDisplay;
};

}

#endif

#endif



/*
 * Copyright (C) 2012 Intel Corporation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"
#include "EGLConfigSelector.h"

#if USE(EGL)

namespace WebCore {

SharedEGLDisplay* SharedEGLDisplay::m_staticSharedEGLDisplay = 0;

static EGLint configAttributeList[] = {
#if USE(OPENGL_ES_2)
    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
#else
    EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
#endif
    EGL_RED_SIZE, 8,
    EGL_GREEN_SIZE, 8,
    EGL_BLUE_SIZE, 8,
    EGL_STENCIL_SIZE, 8,
    EGL_ALPHA_SIZE, 8,
    EGL_SURFACE_TYPE, EGL_NONE,
    EGL_NONE
};

void SharedEGLDisplay::deref()
{
    if (derefBase()) {
        m_staticSharedEGLDisplay = 0;
        delete this;
    }
}

EGLDisplay SharedEGLDisplay::sharedEGLDisplay() const
{
    return m_eglDisplay;
}

SharedEGLDisplay::SharedEGLDisplay(NativeSharedDisplay* display)
    : m_eglDisplay(EGL_NO_DISPLAY)
{
    if (display)
        m_eglDisplay = eglGetDisplay(reinterpret_cast<EGLNativeDisplayType>(display));
    else
        m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    if (m_eglDisplay == EGL_NO_DISPLAY) {
        LOG_ERROR("EGLDisplay Initialization failed.");
        return;
    }

    EGLBoolean success;
    success = eglInitialize(m_eglDisplay, 0, 0);

    if (success != EGL_TRUE) {
        LOG_ERROR("EGLInitialization failed.");
        m_eglDisplay = EGL_NO_DISPLAY;
    }

    success = eglBindAPI(eglAPIVersion);

    if (success != EGL_TRUE) {
        LOG_ERROR("Failed to set EGL API(%d).", eglGetError());
        m_eglDisplay = EGL_NO_DISPLAY;
    }
}

void SharedEGLDisplay::cleanup()
{
    if (m_eglDisplay == EGL_NO_DISPLAY)
        return;

    eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
    eglTerminate(m_eglDisplay);
    m_eglDisplay = EGL_NO_DISPLAY;
}

SharedEGLDisplay::~SharedEGLDisplay()
{
    cleanup();
}

EGLConfigSelector::EGLConfigSelector(NativeSharedDisplay* display)
    : m_pbufferFBConfig(0)
    , m_surfaceContextFBConfig(0)
{
    m_sharedDisplay = SharedEGLDisplay::create(display);
}

EGLConfigSelector::~EGLConfigSelector()
{
}

PlatformDisplay EGLConfigSelector::display() const
{
    return m_sharedDisplay->sharedEGLDisplay();
}

EGLConfig EGLConfigSelector::pBufferContextConfig()
{
    if (!m_pbufferFBConfig) {
        configAttributeList[13] = EGL_PIXMAP_BIT;
        m_pbufferFBConfig = createConfig(configAttributeList);
    }

    return m_pbufferFBConfig;
}

EGLConfig EGLConfigSelector::surfaceContextConfig()
{
    if (!m_surfaceContextFBConfig) {
        configAttributeList[13] = EGL_WINDOW_BIT;
        m_surfaceContextFBConfig = createConfig(configAttributeList);
    }

    return m_surfaceContextFBConfig;
}

EGLint EGLConfigSelector::nativeVisualId(const EGLConfig& config) const
{
    if (display() == EGL_NO_DISPLAY)
        return -1;

    EGLint eglValue = 0;
    eglGetConfigAttrib(display(), config, EGL_NATIVE_VISUAL_ID, &eglValue);

    return eglValue;
}

void EGLConfigSelector::reset()
{
    m_surfaceContextFBConfig = 0;
    m_pbufferFBConfig = 0;
}

EGLConfig EGLConfigSelector::createConfig(const int attributes[])
{
    if (display() == EGL_NO_DISPLAY)
        return 0;

    int numConfigs;
    EGLConfig config = 0;

    if (!eglChooseConfig(display(), attributes, &config, 1, &numConfigs))
        LOG_ERROR("Failed to get supported configirations.");

    if (numConfigs != 1) {
        LOG_ERROR("EGLChooseConfig didn't return exactly one config but (%d).", numConfigs);
        config = 0;
    }

    return config;
}

}

#endif



/*
 * Copyright (C) 2012 Intel Corporation. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef EGLConfigSelector_h
#define EGLConfigSelector_h

#if USE(EGL)

#include <opengl/GLDefs.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>

namespace WebCore {

typedef Display NativeSharedDisplay;

class SharedEGLDisplay : public WTF::RefCountedBase {
    WTF_MAKE_NONCOPYABLE(SharedEGLDisplay);

public:
    static PassRefPtr<SharedEGLDisplay> create(NativeSharedDisplay* display)
    {
        if (!m_staticSharedEGLDisplay)
            m_staticSharedEGLDisplay = new SharedEGLDisplay(display);
        else
            m_staticSharedEGLDisplay->ref();

        return adoptRef(m_staticSharedEGLDisplay);
    }

    void deref();
    EGLDisplay sharedEGLDisplay() const;

protected:
    SharedEGLDisplay(NativeSharedDisplay*);
    void cleanup();
    virtual ~SharedEGLDisplay();

    static SharedEGLDisplay* m_staticSharedEGLDisplay;
    EGLDisplay m_eglDisplay;
};

class EGLConfigSelector {
    WTF_MAKE_NONCOPYABLE(EGLConfigSelector);

public:
    EGLConfigSelector(NativeSharedDisplay* = 0);
    virtual ~EGLConfigSelector();
    PlatformDisplay display() const;
    virtual EGLConfig pBufferContextConfig();
    virtual EGLConfig surfaceContextConfig();
    EGLint nativeVisualId(const EGLConfig&) const;
    void reset();

private:
    EGLConfig createConfig(const int attributes[]);

protected:
    EGLConfig m_pbufferFBConfig;
    EGLConfig m_surfaceContextFBConfig;
    RefPtr<SharedEGLDisplay> m_sharedDisplay;
};

}

#endif

#endif



    : GLPlatformSurface()
{
    m_nativeResource = adoptPtr(new NativeOffScreenWindow());
    m_configSelector = adoptPtr(new EGLConfigSelector(m_nativeResource->nativeSharedDisplay()));
    m_sharedDisplay = m_configSelector->display();

    if (m_sharedDisplay == EGL_NO_DISPLAY) {
        m_configSelector = nullptr;
        m_nativeResource = nullptr;
        return;
    }

    EGLConfig config = m_configSelector->surfaceContextConfig();

    if (!config) {
        destroy();
        return;
    }

    EGLint visualId = m_configSelector->nativeVisualId(config);

    if (visualId == -1) {
        destroy();

        return;
    }

    m_drawable = eglCreateWindowSurface(m_sharedDisplay, m_configSelector->surfaceContextConfig(), (EGLNativeWindowType)m_bufferHandle, 0);

    if (m_drawable == EGL_NO_SURFACE) {
        LOG_ERROR("Failed to create EGL surface(%d).", eglGetError());


PlatformSurfaceConfig EGLWindowTransportSurface::configuration()
{
    return m_configSelector->surfaceContextConfig();
}

void EGLWindowTransportSurface::swapBuffers()

    m_nativeResource->destroyWindow(m_bufferHandle);
    freeEGLResources();
    m_nativeResource = nullptr;
    m_configSelector = nullptr;
    m_bufferHandle = 0;
}





#if USE(EGL) && USE(GRAPHICS_SURFACE)

#include "EGLConfigSelector.h"
#include "GLPlatformSurface.h"

#include <glx/X11WindowResources.h>

private:
    void freeEGLResources();
    OwnPtr<NativeOffScreenWindow> m_nativeResource;
    OwnPtr<EGLConfigSelector> m_configSelector;
};

}

Return to Bug 105876

Lines 293-300 if (WTF_USE_3D_GRAPHICS) Source/WebCore/PlatformEfl.cmake_sec1
- Source/WebCore/PlatformEfl.cmake -1 / +2 lines
293		293
294	if (WTF_USE_EGL)	294	if (WTF_USE_EGL)
295	list(APPEND WebCore_SOURCES	295	list(APPEND WebCore_SOURCES
296	platform/graphics/surfaces/egl/EGLSurface.cpp	296	platform/graphics/surfaces/egl/EGLConfigSelector.cpp
297	platform/graphics/surfaces/egl/EGLContext.cpp	297	platform/graphics/surfaces/egl/EGLContext.cpp
		298	platform/graphics/surfaces/egl/EGLSurface.cpp
298	)	299	)
299	endif ()	300	endif ()
300		301

Lines 1-181 Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.cpp_sec1
- Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.cpp -181 lines
1	/*
2	* Copyright (C) 2012 Intel Corporation. All rights reserved.
3	*
4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions
6	* are met:
7	* 1. Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.
9	* 2. Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.
12	*
13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23	* THE POSSIBILITY OF SUCH DAMAGE.
24	*/
25
26	#include "config.h"
27	#include "EGLConfigHelper.h"
28
29	#if USE(EGL)
30
31	namespace WebCore {
32
33	SharedEGLDisplay* SharedEGLDisplay::m_staticSharedEGLDisplay = 0;
34
35	static EGLint configAttributeList[] = {
36	#if USE(OPENGL_ES_2)
37	EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
38	#else
39	EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
40	#endif
41	EGL_RED_SIZE, 8,
42	EGL_GREEN_SIZE, 8,
43	EGL_BLUE_SIZE, 8,
44	EGL_STENCIL_SIZE, 8,
45	EGL_ALPHA_SIZE, 8,
46	EGL_SURFACE_TYPE, EGL_NONE,
47	EGL_NONE
48	};
49
50	void SharedEGLDisplay::deref()
51	{
52	if (derefBase()) {
53	m_staticSharedEGLDisplay = 0;
54	delete this;
55	}
56	}
57
58	EGLDisplay SharedEGLDisplay::sharedEGLDisplay()
59	{
60	return m_eglDisplay;
61	}
62
63	SharedEGLDisplay::SharedEGLDisplay(NativeSharedDisplay* display)
64	: m_eglDisplay(EGL_NO_DISPLAY)
65	{
66	if (display)
67	m_eglDisplay = eglGetDisplay(reinterpret_cast<EGLNativeDisplayType>(display));
68	else
69	m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
70
71	if (m_eglDisplay == EGL_NO_DISPLAY) {
72	LOG_ERROR("EGLDisplay Initialization failed.");
73	return;
74	}
75
76	EGLBoolean success;
77	success = eglInitialize(m_eglDisplay, 0, 0);
78
79	if (success != EGL_TRUE) {
80	LOG_ERROR("EGLInitialization failed.");
81	m_eglDisplay = EGL_NO_DISPLAY;
82	}
83
84	success = eglBindAPI(eglAPIVersion);
85
86	if (success != EGL_TRUE) {
87	LOG_ERROR("Failed to set EGL API(%d).", eglGetError());
88	m_eglDisplay = EGL_NO_DISPLAY;
89	}
90	}
91
92	void SharedEGLDisplay::cleanup()
93	{
94	if (m_eglDisplay == EGL_NO_DISPLAY)
95	return;
96
97	eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
98	eglTerminate(m_eglDisplay);
99	m_eglDisplay = EGL_NO_DISPLAY;
100	}
101
102	SharedEGLDisplay::~SharedEGLDisplay()
103	{
104	cleanup();
105	}
106
107	EGLConfigHelper::EGLConfigHelper(NativeSharedDisplay* display)
108	: m_pbufferFBConfig(0)
109	, m_surfaceContextFBConfig(0)
110	{
111	m_sharedDisplay = SharedEGLDisplay::create(display);
112	}
113
114	EGLConfigHelper::~EGLConfigHelper()
115	{
116	}
117
118	PlatformDisplay EGLConfigHelper::display()
119	{
120	return m_sharedDisplay->sharedEGLDisplay();
121	}
122
123	EGLConfig EGLConfigHelper::pBufferContextConfig()
124	{
125	if (!m_pbufferFBConfig) {
126	configAttributeList[13] = EGL_PIXMAP_BIT;
127	m_pbufferFBConfig = createConfig(configAttributeList);
128	}
129
130	return m_pbufferFBConfig;
131	}
132
133	EGLConfig EGLConfigHelper::surfaceContextConfig()
134	{
135	if (!m_surfaceContextFBConfig) {
136	configAttributeList[13] = EGL_WINDOW_BIT;
137	m_surfaceContextFBConfig = createConfig(configAttributeList);
138	}
139
140	return m_surfaceContextFBConfig;
141	}
142
143	EGLint EGLConfigHelper::nativeVisualId(const EGLConfig& config)
144	{
145	if (display() == EGL_NO_DISPLAY)
146	return -1;
147
148	EGLint eglValue = 0;
149	eglGetConfigAttrib(display(), config, EGL_NATIVE_VISUAL_ID, &eglValue);
150
151	return eglValue;
152	}
153
154	void EGLConfigHelper::reset()
155	{
156	m_surfaceContextFBConfig = 0;
157	m_pbufferFBConfig = 0;
158	}
159
160	EGLConfig EGLConfigHelper::createConfig(const int attributes[])
161	{
162	if (display() == EGL_NO_DISPLAY)
163	return 0;
164
165	int numConfigs;
166	EGLConfig config = 0;
167
168	if (!eglChooseConfig(display(), attributes, &config, 1, &numConfigs))
169	LOG_ERROR("Failed to get supported configirations.");
170
171	if (numConfigs != 1) {
172	LOG_ERROR("EGLChooseConfig didn't return exactly one config but (%d).", numConfigs);
173	config = 0;
174	}
175
176	return config;
177	}
178
179	}
180
181	#endif

Line 0 Source/WebCore/platform/graphics/surfaces/egl/EGLConfigSelector.cpp_sec1
- Source/WebCore/platform/graphics/surfaces/egl/EGLConfigSelector.cpp +181 lines
		1	/*
		2	* Copyright (C) 2012 Intel Corporation. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	* 1. Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* 2. Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	*
		13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
		14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
		15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
		17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
		23	* THE POSSIBILITY OF SUCH DAMAGE.
		24	*/
		25
		26	#include "config.h"
		27	#include "EGLConfigSelector.h"
		28
		29	#if USE(EGL)
		30
		31	namespace WebCore {
		32
		33	SharedEGLDisplay* SharedEGLDisplay::m_staticSharedEGLDisplay = 0;
		34
		35	static EGLint configAttributeList[] = {
		36	#if USE(OPENGL_ES_2)
		37	EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
		38	#else
		39	EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
		40	#endif
		41	EGL_RED_SIZE, 8,
		42	EGL_GREEN_SIZE, 8,
		43	EGL_BLUE_SIZE, 8,
		44	EGL_STENCIL_SIZE, 8,
		45	EGL_ALPHA_SIZE, 8,
		46	EGL_SURFACE_TYPE, EGL_NONE,
		47	EGL_NONE
		48	};
		49
		50	void SharedEGLDisplay::deref()
		51	{
		52	if (derefBase()) {
		53	m_staticSharedEGLDisplay = 0;
		54	delete this;
		55	}
		56	}
		57
		58	EGLDisplay SharedEGLDisplay::sharedEGLDisplay() const
		59	{
		60	return m_eglDisplay;
		61	}
		62
		63	SharedEGLDisplay::SharedEGLDisplay(NativeSharedDisplay* display)
		64	: m_eglDisplay(EGL_NO_DISPLAY)
65	{
66	if (display)
67	m_eglDisplay = eglGetDisplay(reinterpret_cast<EGLNativeDisplayType>(display));
68	else
69	m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
70
71	if (m_eglDisplay == EGL_NO_DISPLAY) {
72	LOG_ERROR("EGLDisplay Initialization failed.");
73	return;
74	}
75
76	EGLBoolean success;
77	success = eglInitialize(m_eglDisplay, 0, 0);
78
79	if (success != EGL_TRUE) {
80	LOG_ERROR("EGLInitialization failed.");
81	m_eglDisplay = EGL_NO_DISPLAY;
82	}
83
84	success = eglBindAPI(eglAPIVersion);
85
86	if (success != EGL_TRUE) {
87	LOG_ERROR("Failed to set EGL API(%d).", eglGetError());
88	m_eglDisplay = EGL_NO_DISPLAY;
89	}
90	}
91
92	void SharedEGLDisplay::cleanup()
93	{
94	if (m_eglDisplay == EGL_NO_DISPLAY)
95	return;
96
97	eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
98	eglTerminate(m_eglDisplay);
99	m_eglDisplay = EGL_NO_DISPLAY;
100	}
101
102	SharedEGLDisplay::~SharedEGLDisplay()
103	{
104	cleanup();
105	}
106
107	EGLConfigSelector::EGLConfigSelector(NativeSharedDisplay* display)
108	: m_pbufferFBConfig(0)
109	, m_surfaceContextFBConfig(0)
110	{
111	m_sharedDisplay = SharedEGLDisplay::create(display);
112	}
113
114	EGLConfigSelector::~EGLConfigSelector()
115	{
116	}
117
118	PlatformDisplay EGLConfigSelector::display() const
119	{
120	return m_sharedDisplay->sharedEGLDisplay();
121	}
122
123	EGLConfig EGLConfigSelector::pBufferContextConfig()
124	{
125	if (!m_pbufferFBConfig) {
126	configAttributeList[13] = EGL_PIXMAP_BIT;
127	m_pbufferFBConfig = createConfig(configAttributeList);
128	}
129
130	return m_pbufferFBConfig;
131	}
132
133	EGLConfig EGLConfigSelector::surfaceContextConfig()
134	{
135	if (!m_surfaceContextFBConfig) {
136	configAttributeList[13] = EGL_WINDOW_BIT;
137	m_surfaceContextFBConfig = createConfig(configAttributeList);
138	}
139
140	return m_surfaceContextFBConfig;
141	}
142
143	EGLint EGLConfigSelector::nativeVisualId(const EGLConfig& config) const
144	{
145	if (display() == EGL_NO_DISPLAY)
146	return -1;
147
148	EGLint eglValue = 0;
149	eglGetConfigAttrib(display(), config, EGL_NATIVE_VISUAL_ID, &eglValue);
150
151	return eglValue;
152	}
153
154	void EGLConfigSelector::reset()
155	{
156	m_surfaceContextFBConfig = 0;
157	m_pbufferFBConfig = 0;
158	}
159
160	EGLConfig EGLConfigSelector::createConfig(const int attributes[])
161	{
162	if (display() == EGL_NO_DISPLAY)
163	return 0;
164
165	int numConfigs;
166	EGLConfig config = 0;
167
168	if (!eglChooseConfig(display(), attributes, &config, 1, &numConfigs))
169	LOG_ERROR("Failed to get supported configirations.");
170
171	if (numConfigs != 1) {
172	LOG_ERROR("EGLChooseConfig didn't return exactly one config but (%d).", numConfigs);
173	config = 0;
174	}
175
176	return config;
177	}
178
179	}
180
181	#endif

Lines 34-56 EGLWindowTransportSurface::EGLWindowTransportSurface() Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp_sec1
- Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp -8 / +8 lines
34	: GLPlatformSurface()	34	: GLPlatformSurface()
35	{	35	{
36	m_nativeResource = adoptPtr(new NativeOffScreenWindow());	36	m_nativeResource = adoptPtr(new NativeOffScreenWindow());
37	m_eglConfigHelper = adoptPtr(new EGLConfigHelper(m_nativeResource->nativeSharedDisplay()));	37	m_configSelector = adoptPtr(new EGLConfigSelector(m_nativeResource->nativeSharedDisplay()));
38	m_sharedDisplay = m_eglConfigHelper->display();	38	m_sharedDisplay = m_configSelector->display();
39		39
40	if (m_sharedDisplay == EGL_NO_DISPLAY) {	40	if (m_sharedDisplay == EGL_NO_DISPLAY) {
41	m_eglConfigHelper = nullptr;	41	m_configSelector = nullptr;
42	m_nativeResource = nullptr;	42	m_nativeResource = nullptr;
43	return;	43	return;
44	}	44	}
45		45
46	EGLConfig config = m_eglConfigHelper->surfaceContextConfig();	46	EGLConfig config = m_configSelector->surfaceContextConfig();
47		47
48	if (!config) {	48	if (!config) {
49	destroy();	49	destroy();
50	return;	50	return;
51	}	51	}
52		52
53	EGLint visualId = m_eglConfigHelper->nativeVisualId(config);	53	EGLint visualId = m_configSelector->nativeVisualId(config);
54		54
55	if (visualId == -1) {	55	if (visualId == -1) {
56	destroy();	56	destroy();
Lines 69-75 EGLWindowTransportSurface::EGLWindowTransportSurface() Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp_sec2
69	return;	69	return;
70	}	70	}
71		71
72	m_drawable = eglCreateWindowSurface(m_sharedDisplay, m_eglConfigHelper->surfaceContextConfig(), (EGLNativeWindowType)m_bufferHandle, 0);	72	m_drawable = eglCreateWindowSurface(m_sharedDisplay, m_configSelector->surfaceContextConfig(), (EGLNativeWindowType)m_bufferHandle, 0);
73		73
74	if (m_drawable == EGL_NO_SURFACE) {	74	if (m_drawable == EGL_NO_SURFACE) {
75	LOG_ERROR("Failed to create EGL surface(%d).", eglGetError());	75	LOG_ERROR("Failed to create EGL surface(%d).", eglGetError());
Lines 83-89 EGLWindowTransportSurface::~EGLWindowTransportSurface() Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp_sec3
83		83
84	PlatformSurfaceConfig EGLWindowTransportSurface::configuration()	84	PlatformSurfaceConfig EGLWindowTransportSurface::configuration()
85	{	85	{
86	return m_eglConfigHelper->surfaceContextConfig();	86	return m_configSelector->surfaceContextConfig();
87	}	87	}
88		88
89	void EGLWindowTransportSurface::swapBuffers()	89	void EGLWindowTransportSurface::swapBuffers()
Lines 111-117 void EGLWindowTransportSurface::destroy() Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.cpp_sec4
111	m_nativeResource->destroyWindow(m_bufferHandle);	111	m_nativeResource->destroyWindow(m_bufferHandle);
112	freeEGLResources();	112	freeEGLResources();
113	m_nativeResource = nullptr;	113	m_nativeResource = nullptr;
114	m_eglConfigHelper = nullptr;	114	m_configSelector = nullptr;
115	m_bufferHandle = 0;	115	m_bufferHandle = 0;
116	}	116	}
117		117

Lines 28-34 Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h_sec1
- Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h -2 / +2 lines
28		28
29	#if USE(EGL) && USE(GRAPHICS_SURFACE)	29	#if USE(EGL) && USE(GRAPHICS_SURFACE)
30		30
31	#include "EGLConfigHelper.h"	31	#include "EGLConfigSelector.h"
32	#include "GLPlatformSurface.h"	32	#include "GLPlatformSurface.h"
33		33
34	#include <glx/X11WindowResources.h>	34	#include <glx/X11WindowResources.h>
Lines 53-59 public: Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h_sec2
53	private:	53	private:
54	void freeEGLResources();	54	void freeEGLResources();
55	OwnPtr<NativeOffScreenWindow> m_nativeResource;	55	OwnPtr<NativeOffScreenWindow> m_nativeResource;
56	OwnPtr<EGLConfigHelper> m_eglConfigHelper;	56	OwnPtr<EGLConfigSelector> m_configSelector;
57	};	57	};
58		58
59	}	59	}

Lines 1-3 ChangeLog_sec1
- ChangeLog +13 lines
		1	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>
		2
		3	[EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
		4	https://bugs.webkit.org/show_bug.cgi?id=105876
		5
		6	Reviewed by Kenneth Rohde Christiansen.
		7
		8	This is to sync the naming conventions of our classes in both EGL and GLX implementations.
		9	In our GLX implementation, class responsible for the same functionality is named as GLXConfigSelector.
		10	This patch renames EGLConfigHelper as EGLConfigSelector.
		11
		12	* Source/cmake/OptionsEfl.cmake:
		13
1	2012-12-27 Kondapally Kalyan <kalyan.kondapally@intel.com>	14	2012-12-27 Kondapally Kalyan <kalyan.kondapally@intel.com>
2		15
3	[EFL][WebGL] Implement EGL support with GLX.	16	[EFL][WebGL] Implement EGL support with GLX.

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +39 lines
		1	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>
		2
		3	[EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.
		4	https://bugs.webkit.org/show_bug.cgi?id=105876
		5
		6	Reviewed by Kenneth Rohde Christiansen.
		7
		8	This is to sync the naming conventions of our classes in both EGL and GLX implementations.
		9	In our GLX implementation, class responsible for the same functionality is named as GLXConfigSelector.
		10	This patch renames EGLConfigHelper as EGLConfigSelector.
		11
		12	* PlatformEfl.cmake:
		13	* platform/graphics/surfaces/egl/EGLConfigSelector.cpp: Renamed from Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.cpp.
		14	(WebCore):
		15	(WebCore::SharedEGLDisplay::deref):
		16	(WebCore::SharedEGLDisplay::sharedEGLDisplay):
		17	(WebCore::SharedEGLDisplay::SharedEGLDisplay):
		18	(WebCore::SharedEGLDisplay::cleanup):
		19	(WebCore::SharedEGLDisplay::~SharedEGLDisplay):
		20	(WebCore::EGLConfigSelector::EGLConfigSelector):
		21	(WebCore::EGLConfigSelector::~EGLConfigSelector):
		22	(WebCore::EGLConfigSelector::display):
		23	(WebCore::EGLConfigSelector::pBufferContextConfig):
		24	(WebCore::EGLConfigSelector::surfaceContextConfig):
		25	(WebCore::EGLConfigSelector::nativeVisualId):
		26	(WebCore::EGLConfigSelector::reset):
		27	(WebCore::EGLConfigSelector::createConfig):
		28	* platform/graphics/surfaces/egl/EGLConfigSelector.h: Renamed from Source/WebCore/platform/graphics/surfaces/egl/EGLConfigHelper.h.
		29	(WebCore):
		30	(SharedEGLDisplay):
		31	(WebCore::SharedEGLDisplay::create):
		32	(EGLConfigSelector):
		33	* platform/graphics/surfaces/egl/EGLSurface.cpp:
		34	(WebCore::EGLWindowTransportSurface::EGLWindowTransportSurface):
		35	(WebCore::EGLWindowTransportSurface::configuration):
		36	(WebCore::EGLWindowTransportSurface::destroy):
		37	* platform/graphics/surfaces/egl/EGLSurface.h:
		38	(EGLWindowTransportSurface):
		39
1	2012-12-30 Philippe Normand <pnormand@igalia.com>	40	2012-12-30 Philippe Normand <pnormand@igalia.com>
2		41
3	[GStreamer] webaudio/decode-audio-data-basic.html fails	42	[GStreamer] webaudio/decode-audio-data-basic.html fails