mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0027811: Configuration - allow building TKOpenGl with OpenGL ES on Windows
OpenGl_ShaderManager::prepareStdProgramFboBlit() now tries using extension GL_EXT_frag_depth within OpenGL ES 2.0 when OpenGL ES 3.0 is not available. OpenGl_View::blitBuffers() now disables Depth test when copying depth values is not supported by OpenGL ES 2.0 hardware. Fixed building for UWP with SDK 10.0.10240.0 Fixed building TKService, TKV3d and TKOpenGl for UWP. OSD_Environment now defines global environment map for emulating desktop behavior on UWP.
This commit is contained in:
kgv
bugmaster
111
src/Aspect/Aspect_NeutralWindow.cxx
Normal file
111
src/Aspect/Aspect_NeutralWindow.cxx
Normal file
@@ -0,0 +1,111 @@
|
||||
// Copyright (c) 2016 OPEN CASCADE SAS
|
||||
//
|
||||
// This file is part of Open CASCADE Technology software library.
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it under
|
||||
// the terms of the GNU Lesser General Public License version 2.1 as published
|
||||
// by the Free Software Foundation, with special exception defined in the file
|
||||
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#include <Aspect_NeutralWindow.hxx>
|
||||
|
||||
IMPLEMENT_STANDARD_RTTIEXT(Aspect_NeutralWindow, Aspect_Window)
|
||||
|
||||
// =======================================================================
|
||||
// function : Aspect_NeutralWindow
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Aspect_NeutralWindow::Aspect_NeutralWindow()
|
||||
: myHandle (0),
|
||||
myParentHandle (0),
|
||||
myFBConfig (0),
|
||||
myPosX (0),
|
||||
myPosY (0),
|
||||
myWidth (0),
|
||||
myHeight (0),
|
||||
myIsMapped (Standard_True) {}
|
||||
|
||||
// =======================================================================
|
||||
// function : SetNativeHandles
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Standard_Boolean Aspect_NeutralWindow::SetNativeHandles (Aspect_Drawable theWindow,
|
||||
Aspect_Drawable theParentWindow,
|
||||
Aspect_FBConfig theFbConfig)
|
||||
{
|
||||
if (myHandle == theWindow
|
||||
&& myParentHandle == theParentWindow
|
||||
&& myFBConfig == theFbConfig)
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
myHandle = theWindow;
|
||||
myParentHandle = theParentWindow;
|
||||
myFBConfig = theFbConfig;
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : SetPosition
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Standard_Boolean Aspect_NeutralWindow::SetPosition (Standard_Integer theX1,
|
||||
Standard_Integer theY1)
|
||||
{
|
||||
if (myPosX == theX1
|
||||
&& myPosY == theY1)
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
myPosX = theX1;
|
||||
myPosY = theY1;
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : SetPosition
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Standard_Boolean Aspect_NeutralWindow::SetPosition (Standard_Integer theX1, Standard_Integer theY1,
|
||||
Standard_Integer theX2, Standard_Integer theY2)
|
||||
{
|
||||
Standard_Integer aWidthNew = theX2 - theX1;
|
||||
Standard_Integer aHeightNew = theY2 - theY1;
|
||||
if (myPosX == theX1
|
||||
&& myPosY == theY1
|
||||
&& myWidth == aWidthNew
|
||||
&& myHeight == aHeightNew)
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
myPosX = theX1;
|
||||
myWidth = aWidthNew;
|
||||
myPosY = theY1;
|
||||
myHeight = aHeightNew;
|
||||
return Standard_True;
|
||||
}
|
||||
|
||||
// =======================================================================
|
||||
// function : SetSize
|
||||
// purpose :
|
||||
// =======================================================================
|
||||
Standard_Boolean Aspect_NeutralWindow::SetSize (const Standard_Integer theWidth,
|
||||
const Standard_Integer theHeight)
|
||||
{
|
||||
if (myWidth == theWidth
|
||||
&& myHeight == theHeight)
|
||||
{
|
||||
return Standard_False;
|
||||
}
|
||||
|
||||
myWidth = theWidth;
|
||||
myHeight = theHeight;
|
||||
return Standard_True;
|
||||
}
|
||||
123
src/Aspect/Aspect_NeutralWindow.hxx
Normal file
123
src/Aspect/Aspect_NeutralWindow.hxx
Normal file
@@ -0,0 +1,123 @@
|
||||
// Copyright (c) 2016 OPEN CASCADE SAS
|
||||
//
|
||||
// This file is part of Open CASCADE Technology software library.
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or modify it under
|
||||
// the terms of the GNU Lesser General Public License version 2.1 as published
|
||||
// by the Free Software Foundation, with special exception defined in the file
|
||||
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
||||
// distribution for complete text of the license and disclaimer of any warranty.
|
||||
//
|
||||
// Alternatively, this file may be used under the terms of Open CASCADE
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#ifndef _Aspect_NeutralWindow_HeaderFile
|
||||
#define _Aspect_NeutralWindow_HeaderFile
|
||||
|
||||
#include <Aspect_Window.hxx>
|
||||
|
||||
//! Defines a platform-neutral window.
|
||||
//! This class is intended to be used in context when window management (including OpenGL context creation)
|
||||
//! is performed on application side (e.g. using external framework).
|
||||
//!
|
||||
//! Window properties should be managed by application and assigned to this class as properties.
|
||||
class Aspect_NeutralWindow : public Aspect_Window
|
||||
{
|
||||
DEFINE_STANDARD_RTTIEXT(Aspect_NeutralWindow, Aspect_Window)
|
||||
public:
|
||||
|
||||
//! Empty constructor.
|
||||
//! Note that window is considered "mapped" by default.
|
||||
Standard_EXPORT Aspect_NeutralWindow();
|
||||
|
||||
//! Return native handle of this drawable.
|
||||
virtual Aspect_Drawable NativeHandle() const Standard_OVERRIDE { return myHandle; }
|
||||
|
||||
//! Return native handle of the parent drawable.
|
||||
virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return myParentHandle; }
|
||||
|
||||
//! Return FBConfig.
|
||||
virtual Aspect_FBConfig NativeFBConfig() const Standard_OVERRIDE { return myFBConfig; }
|
||||
|
||||
//! Set native handle.
|
||||
//! @return true if definition has been changed
|
||||
Standard_EXPORT Standard_Boolean SetNativeHandle (Aspect_Drawable theWindow) { return SetNativeHandles (theWindow, 0, 0); }
|
||||
|
||||
//! Set native handles.
|
||||
//! @return true if definition has been changed
|
||||
Standard_EXPORT Standard_Boolean SetNativeHandles (Aspect_Drawable theWindow,
|
||||
Aspect_Drawable theParentWindow,
|
||||
Aspect_FBConfig theFbConfig);
|
||||
|
||||
//! Return true if window is not hidden.
|
||||
virtual Standard_Boolean IsMapped() const Standard_OVERRIDE { return myIsMapped; }
|
||||
|
||||
//! Change window mapped flag to TRUE.
|
||||
virtual void Map() const Standard_OVERRIDE { myIsMapped = Standard_True; }
|
||||
|
||||
//! Change window mapped flag to FALSE.
|
||||
virtual void Unmap() const Standard_OVERRIDE { myIsMapped = Standard_False; }
|
||||
|
||||
//! Resize window - do nothing.
|
||||
virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; }
|
||||
|
||||
//! Map window - do nothing.
|
||||
virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; }
|
||||
|
||||
//! Returns window ratio equal to the physical width/height dimensions.
|
||||
virtual Quantity_Ratio Ratio() const Standard_OVERRIDE
|
||||
{
|
||||
return (myWidth != 0 && myHeight != 0)
|
||||
? Quantity_Ratio(myWidth) / Quantity_Ratio(myHeight)
|
||||
: 1.0;
|
||||
}
|
||||
|
||||
//! Return the window position.
|
||||
virtual void Position (Standard_Integer& theX1, Standard_Integer& theY1,
|
||||
Standard_Integer& theX2, Standard_Integer& theY2) const Standard_OVERRIDE
|
||||
{
|
||||
theX1 = myPosX;
|
||||
theX2 = myPosX + myWidth;
|
||||
theY1 = myPosY;
|
||||
theY2 = myPosY + myHeight;
|
||||
}
|
||||
|
||||
//! Set the window position.
|
||||
//! @return true if position has been changed
|
||||
Standard_EXPORT Standard_Boolean SetPosition (Standard_Integer theX1,
|
||||
Standard_Integer theY1);
|
||||
|
||||
//! Set the window position.
|
||||
//! @return true if position has been changed
|
||||
Standard_EXPORT Standard_Boolean SetPosition (Standard_Integer theX1, Standard_Integer theY1,
|
||||
Standard_Integer theX2, Standard_Integer theY2);
|
||||
|
||||
//! Return the window size.
|
||||
virtual void Size (Standard_Integer& theWidth,
|
||||
Standard_Integer& theHeight) const Standard_OVERRIDE
|
||||
{
|
||||
theWidth = myWidth;
|
||||
theHeight = myHeight;
|
||||
}
|
||||
|
||||
//! Set the window size.
|
||||
//! @return true if size has been changed
|
||||
Standard_EXPORT Standard_Boolean SetSize (const Standard_Integer theWidth,
|
||||
const Standard_Integer theHeight);
|
||||
|
||||
protected:
|
||||
|
||||
Aspect_Drawable myHandle;
|
||||
Aspect_Drawable myParentHandle;
|
||||
Aspect_FBConfig myFBConfig;
|
||||
Standard_Integer myPosX;
|
||||
Standard_Integer myPosY;
|
||||
Standard_Integer myWidth;
|
||||
Standard_Integer myHeight;
|
||||
mutable Standard_Boolean myIsMapped;
|
||||
|
||||
};
|
||||
|
||||
DEFINE_STANDARD_HANDLE(Aspect_NeutralWindow, Aspect_Window)
|
||||
|
||||
#endif // _Aspect_NeutralWindow_HeaderFile
|
||||
@@ -25,6 +25,8 @@ Aspect_Grid.cxx
|
||||
Aspect_Grid.hxx
|
||||
Aspect_GridDrawMode.hxx
|
||||
Aspect_GridType.hxx
|
||||
Aspect_NeutralWindow.cxx
|
||||
Aspect_NeutralWindow.hxx
|
||||
Aspect_Handle.hxx
|
||||
Aspect_HatchStyle.hxx
|
||||
Aspect_IdentDefinitionError.hxx
|
||||
|
||||
Reference in New Issue
Block a user