Hash :
4c833efb
Author :
Date :
2019-07-11T11:29:35
Vulkan: Enable sampler objects This is the initial implementation to get GLES3.0 Sampler Objects working on the Vulkan backend. When samplers are dirty, a corresponding Vulkan sampler object will be created with associated state and textures are flagged as dirty anytime sampler bindings change. Then when handling textures dirty, any bound sampler objects are pulled from active texture units. When sampler objects are bound, their state is used instead of the built-in texture's sampler state. This change also adds a test that uses the same texture object with different sampler objects to test a corner case that dEQP misses. Bug: angleproject:3208 Change-Id: I643d9c9d5cb92fecc02dad815a07bcf349534c70 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1706897 Commit-Queue: Tobin Ehlis <tobine@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
//
// Copyright 2014 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SamplerGL.cpp: Defines the rx::SamplerGL class, an implementation of SamplerImpl.
#include "libANGLE/renderer/gl/SamplerGL.h"
#include "libANGLE/renderer/gl/FunctionsGL.h"
#include "libANGLE/renderer/gl/StateManagerGL.h"
namespace
{
template <typename T>
inline void SetSamplerParameter(const rx::FunctionsGL *functions,
GLuint sampler,
GLenum name,
const T &value)
{
functions->samplerParameterf(sampler, name, static_cast<GLfloat>(value));
}
inline void SetSamplerParameter(const rx::FunctionsGL *functions,
GLuint sampler,
GLenum name,
const angle::ColorGeneric &value)
{
switch (value.type)
{
case angle::ColorGeneric::Type::Float:
functions->samplerParameterfv(sampler, name, &value.colorF.red);
break;
case angle::ColorGeneric::Type::Int:
functions->samplerParameterIiv(sampler, name, &value.colorI.red);
break;
case angle::ColorGeneric::Type::UInt:
functions->samplerParameterIuiv(sampler, name, &value.colorUI.red);
break;
default:
UNREACHABLE();
break;
}
}
template <typename Getter, typename Setter>
static inline void SyncSamplerStateMember(const rx::FunctionsGL *functions,
GLuint sampler,
const gl::SamplerState &newState,
gl::SamplerState &curState,
GLenum name,
Getter getter,
Setter setter)
{
if ((curState.*getter)() != (newState.*getter)())
{
(curState.*setter)((newState.*getter)());
SetSamplerParameter(functions, sampler, name, (newState.*getter)());
}
}
} // namespace
namespace rx
{
SamplerGL::SamplerGL(const gl::SamplerState &state,
const FunctionsGL *functions,
StateManagerGL *stateManager)
: SamplerImpl(state),
mFunctions(functions),
mStateManager(stateManager),
mAppliedSamplerState(),
mSamplerID(0)
{
mFunctions->genSamplers(1, &mSamplerID);
}
SamplerGL::~SamplerGL()
{
mStateManager->deleteSampler(mSamplerID);
mSamplerID = 0;
}
angle::Result SamplerGL::syncState(const gl::Context *context, const bool dirty)
{
if (!dirty)
{
return angle::Result::Continue;
}
// clang-format off
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_FILTER, &gl::SamplerState::getMinFilter, &gl::SamplerState::setMinFilter);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAG_FILTER, &gl::SamplerState::getMagFilter, &gl::SamplerState::setMagFilter);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_S, &gl::SamplerState::getWrapS, &gl::SamplerState::setWrapS);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_T, &gl::SamplerState::getWrapT, &gl::SamplerState::setWrapT);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_WRAP_R, &gl::SamplerState::getWrapR, &gl::SamplerState::setWrapR);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_ANISOTROPY_EXT, &gl::SamplerState::getMaxAnisotropy, &gl::SamplerState::setMaxAnisotropy);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_LOD, &gl::SamplerState::getMinLod, &gl::SamplerState::setMinLod);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MAX_LOD, &gl::SamplerState::getMaxLod, &gl::SamplerState::setMaxLod);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_MODE, &gl::SamplerState::getCompareMode, &gl::SamplerState::setCompareMode);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_COMPARE_FUNC, &gl::SamplerState::getCompareFunc, &gl::SamplerState::setCompareFunc);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_SRGB_DECODE_EXT, &gl::SamplerState::getSRGBDecode, &gl::SamplerState::setSRGBDecode);
SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_BORDER_COLOR, &gl::SamplerState::getBorderColor, &gl::SamplerState::setBorderColor);
// clang-format on
return angle::Result::Continue;
}
GLuint SamplerGL::getSamplerID() const
{
return mSamplerID;
}
} // namespace rx