mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-16 10:08:36 +03:00
cc8cbabe5c
Graphic3d_AspectFillArea3d now stores array of textures. Graphic3d_TextureParams stores texture unit for mapping texture. OpenGl_Context::BindTextures() - context now manages the set of active textures. Related code has been removed from OpenGl_Workspace. OpenGl_Sampler has been extended to hold texture parameters structure. OpenGl_Texture now holds OpenGl_Sampler instance as class field. OpenGl_Texture inherits new class OpenGl_NamedResource and holds texture identifier used for sharing resource in OpenGl_Context. OpenGl_RaytraceGeometry now creates bindless textures taking Sampler object directly from OpenGl_Texture. OpenGl_Context::BindTextures() automatically recreates immutable Sampler Object on texture parameters change. Declared new structure OpenGl_ArbSamplerObject for platform-neutral usage of related functionality. Related functions are now loaded within OpenGL ES 3.0+. Declarations.glsl - occActiveSampler has been renamed to occSampler0 with aliases occSamplerBaseColor (main) and occActiveSampler (for compatibility). Additional texture samplers should be declared explicitly within specific GLSL program as occSampler1, occSampler2, etc. AIS_Shape and AIS_ColoredShape now computes Shaded presentation with UV coordinates if texture mapping is enabled in Drawer. vshaderprog now accepts Shader source code as parameter.
44 lines
1.7 KiB
C++
44 lines
1.7 KiB
C++
// Copyright (c) 2017 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 _OpenGl_ArbSamplerObject_Header
|
|
#define _OpenGl_ArbSamplerObject_Header
|
|
|
|
#include <OpenGl_GlFunctions.hxx>
|
|
|
|
//! Provide Sampler Object functionality (texture parameters stored independently from texture itself).
|
|
//! Available since OpenGL 3.3+ (GL_ARB_sampler_objects extension) and OpenGL ES 3.0+.
|
|
struct OpenGl_ArbSamplerObject : protected OpenGl_GlFunctions
|
|
{
|
|
using OpenGl_GlFunctions::glGenSamplers;
|
|
using OpenGl_GlFunctions::glDeleteSamplers;
|
|
using OpenGl_GlFunctions::glIsSampler;
|
|
using OpenGl_GlFunctions::glBindSampler;
|
|
using OpenGl_GlFunctions::glSamplerParameteri;
|
|
using OpenGl_GlFunctions::glSamplerParameteriv;
|
|
using OpenGl_GlFunctions::glSamplerParameterf;
|
|
using OpenGl_GlFunctions::glSamplerParameterfv;
|
|
using OpenGl_GlFunctions::glGetSamplerParameteriv;
|
|
using OpenGl_GlFunctions::glGetSamplerParameterfv;
|
|
|
|
#if !defined(GL_ES_VERSION_2_0)
|
|
using OpenGl_GlFunctions::glSamplerParameterIiv;
|
|
using OpenGl_GlFunctions::glSamplerParameterIuiv;
|
|
using OpenGl_GlFunctions::glGetSamplerParameterIiv;
|
|
using OpenGl_GlFunctions::glGetSamplerParameterIuiv;
|
|
#endif
|
|
|
|
};
|
|
|
|
#endif // _OpenGl_ArbSamplerObject_Header
|