Skip to content

Commit

Permalink
Updated source to match fx
Browse files Browse the repository at this point in the history
  • Loading branch information
@medcelerate
medcelerate committed Jul 21, 2024
1 parent 6205baa commit d9f783c
Show file tree
Hide file tree
Showing 2 changed files with 171 additions and 125 deletions.
291 changes: 167 additions & 124 deletions FFGLTouchEngine/src/TouchEngine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,46 @@ std::string GenerateRandomString(size_t length)
return str;
}

FFResult FailAndLog(std::string msg) {

FFGLLog::LogToHost(msg.c_str());
return FF_FAIL;
}


DXGI_FORMAT GlToDXFromat(GLint format) {

switch (format) {
case GL_RGBA8:
return DXGI_FORMAT_B8G8R8A8_UNORM;

case GL_RGBA16:
return DXGI_FORMAT_R16G16B16A16_UNORM;
}
}

GLenum GetGlType(GLint format) {
switch (format) {
case GL_UNSIGNED_BYTE:
return GL_RGBA;
case GL_RGBA16:
return GL_UNSIGNED_SHORT;
}
}

GLenum GetGlType(DXGI_FORMAT format) {
switch (format) {
case DXGI_FORMAT_B8G8R8A8_UNORM:
return GL_UNSIGNED_BYTE;
case DXGI_FORMAT_R16G16B16A16_UNORM:
return GL_UNSIGNED_SHORT;
case DXGI_FORMAT_R32G32B32A32_FLOAT:
return GL_FLOAT;
default:
return GL_UNSIGNED_BYTE;
}
}

FFGLTouchEngine::FFGLTouchEngine()
: CFFGLPlugin()
{
Expand Down Expand Up @@ -189,13 +229,13 @@ FFResult FFGLTouchEngine::ProcessOpenGL(ProcessOpenGLStruct* pGL)

for (auto& param : Parameters) {
FFUInt32 type = ParameterMapType[param.second];

if (type == FF_TYPE_STANDARD) {
TEResult result = TEInstanceLinkSetDoubleValue(instance, param.first.c_str(), &ParameterMapFloat[param.second], 1);
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
return FailAndLog("Failed to set double value");
}
}

Expand All @@ -204,7 +244,7 @@ FFResult FFGLTouchEngine::ProcessOpenGL(ProcessOpenGLStruct* pGL)
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
return FailAndLog("Failed to set int value");
}
}

Expand All @@ -214,170 +254,173 @@ FFResult FFGLTouchEngine::ProcessOpenGL(ProcessOpenGLStruct* pGL)
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
return FailAndLog("Failed to set boolean value");
}
}

if (type == FF_TYPE_TEXT) {
TEResult result = TEInstanceLinkSetStringValue(instance, param.first.c_str(), ParameterMapString[param.second].c_str());
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
if (type == FF_TYPE_TEXT) {
TEResult result = TEInstanceLinkSetStringValue(instance, param.first.c_str(), ParameterMapString[param.second].c_str());
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FailAndLog("Failed to set string value");
}
}
}

if (type == FF_TYPE_OPTION) {
TEResult result = TEInstanceLinkSetIntValue(instance, param.first.c_str(), &ParameterMapInt[param.second], 1);
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
if (type == FF_TYPE_OPTION) {
TEResult result = TEInstanceLinkSetIntValue(instance, param.first.c_str(), &ParameterMapInt[param.second], 1);
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FailAndLog("Failed to set option value");
}
}

}

}

TEResult result = TEInstanceStartFrameAtTime(instance, FrameCount, 60, false);
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
}
FrameCount++;

TEResult result = TEInstanceStartFrameAtTime(instance, FrameCount, 60, false);
if (result != TEResultSuccess)
{
isTouchFrameBusy = false;
return FF_FAIL;
}
FrameCount++;
while (isTouchFrameBusy)
{

while (isTouchFrameBusy)
{
}

}
if (hasVideoOutput) {
TouchObject<TETexture> TETextureToSend;
//Will need to replace the below value with something more standard
result = TEInstanceLinkGetTextureValue(instance, "op/out1", TELinkValueCurrent, TETextureToSend.take());
if (result == TEResultSuccess && TETextureToSend != nullptr) {
if (TETextureGetType(TETextureToSend) == TETextureTypeD3DShared && result == TEResultSuccess) {
TouchObject<TED3D11Texture> D3DTextureToSend;
result = TED3D11ContextGetTexture(D3DContext, static_cast<TED3DSharedTexture*>(TETextureToSend.get()), D3DTextureToSend.take());
if (result != TEResultSuccess)
{
return FF_FALSE;
}
ID3D11Texture2D* RawTextureToSend = TED3D11TextureGetTexture(D3DTextureToSend);

if (hasVideoOutput) {
TouchObject<TETexture> TETextureToSend;
//Will need to replace the below value with something more standard
result = TEInstanceLinkGetTextureValue(instance, "op/out1", TELinkValueCurrent, TETextureToSend.take());
if (result == TEResultSuccess && TETextureToSend != nullptr) {
if (TETextureGetType(TETextureToSend) == TETextureTypeD3DShared && result == TEResultSuccess) {
TouchObject<TED3D11Texture> D3DTextureToSend;
result = TED3D11ContextGetTexture(D3DContext, static_cast<TED3DSharedTexture*>(TETextureToSend.get()), D3DTextureToSend.take());
if (result != TEResultSuccess)
{
return FF_FALSE;
}
ID3D11Texture2D* RawTextureToSend = TED3D11TextureGetTexture(D3DTextureToSend);
if (RawTextureToSend == nullptr) {
return FF_FALSE;
}

if (RawTextureToSend == nullptr) {
return FF_FALSE;
}
D3D11_TEXTURE2D_DESC RawTextureDesc;
ZeroMemory(&RawTextureDesc, sizeof(RawTextureDesc));

D3D11_TEXTURE2D_DESC RawTextureDesc;
ZeroMemory(&RawTextureDesc, sizeof(RawTextureDesc));
RawTextureToSend->GetDesc(&RawTextureDesc);

RawTextureToSend->GetDesc(&RawTextureDesc);
if (!isInteropInitialized) {
OutputInterop.SetSenderName(SpoutID.c_str());

if (!isInteropInitialized) {
OutputInterop.SetSenderName(SpoutID.c_str());
if (!OutputInterop.OpenDirectX11(D3DDevice.Get())) {
FFGLLog::LogToHost("Failed to open DirectX11");
return FF_FAIL;
}

if (!OutputInterop.OpenDirectX11(D3DDevice.Get())) {
FFGLLog::LogToHost("Failed to open DirectX11");
return FF_FAIL;
}
if (!OutputInterop.CreateInterop(OutputWidth, OutputHeight, RawTextureDesc.Format, false)) {
FFGLLog::LogToHost("Failed to create interop");
return FF_FAIL;
}

if (!OutputInterop.CreateInterop(OutputWidth, OutputHeight, DXGI_FORMAT_B8G8R8A8_UNORM, false)) {
FFGLLog::LogToHost("Failed to create interop");
return FF_FAIL;
}
OutputInterop.frame.CreateAccessMutex("mutex");

OutputInterop.frame.CreateAccessMutex("mutex");
if (!OutputInterop.spoutdx.CreateDX11Texture(D3DDevice.Get(), OutputWidth, OutputHeight, RawTextureDesc.Format, &D3DTextureOutput)) {
FFGLLog::LogToHost("Failed to create DX11 texture");
return FF_FAIL;
}

if (!OutputInterop.spoutdx.CreateDX11Texture(D3DDevice.Get(), OutputWidth, OutputHeight, DXGI_FORMAT_B8G8R8A8_UNORM, &D3DTextureOutput)) {
FFGLLog::LogToHost("Failed to create DX11 texture");
return FF_FAIL;
InitializeGlTexture(SpoutTexture, OutputWidth, OutputHeight, GetGlType(RawTextureDesc.Format));

isInteropInitialized = true;
}

InitializeGlTexture(SpoutTexture, OutputWidth, OutputHeight);
if (
RawTextureDesc.Width != OutputWidth
|| RawTextureDesc.Height != OutputHeight
|| GetGlType(RawTextureDesc.Format) != GLFormat
) {
OutputWidth = RawTextureDesc.Width;
OutputHeight = RawTextureDesc.Height;

if (!OutputInterop.CleanupInterop()) {
FFGLLog::LogToHost("Failed to cleanup interop");
return FF_FAIL;
}

isInteropInitialized = true;
}
if (!OutputInterop.CreateInterop(OutputWidth, OutputHeight, RawTextureDesc.Format, false)) {
FFGLLog::LogToHost("Failed to create interop");
return FF_FAIL;
}

if (RawTextureDesc.Width != OutputWidth || RawTextureDesc.Height != OutputHeight) {
OutputWidth = RawTextureDesc.Width;
OutputHeight = RawTextureDesc.Height;
OutputInterop.spoutdx.CreateDX11Texture(D3DDevice.Get(), OutputWidth, OutputHeight, RawTextureDesc.Format, &D3DTextureOutput);

if (!OutputInterop.CleanupInterop()) {
FFGLLog::LogToHost("Failed to cleanup interop");
return FF_FAIL;
InitializeGlTexture(SpoutTexture, OutputWidth, OutputHeight, GetGlType(RawTextureDesc.Format));
}

if (!OutputInterop.CreateInterop(OutputWidth, OutputHeight, DXGI_FORMAT_B8G8R8A8_UNORM, false)) {
FFGLLog::LogToHost("Failed to create interop");
IDXGIKeyedMutex* keyedMutex;
RawTextureToSend->QueryInterface<IDXGIKeyedMutex>(&keyedMutex);

if (keyedMutex == nullptr) {
return FF_FAIL;
}

OutputInterop.spoutdx.CreateDX11Texture(D3DDevice.Get(), OutputWidth, OutputHeight, DXGI_FORMAT_B8G8R8A8_UNORM, &D3DTextureOutput);

InitializeGlTexture(SpoutTexture, OutputWidth, OutputHeight);
}

IDXGIKeyedMutex* keyedMutex;
RawTextureToSend->QueryInterface<IDXGIKeyedMutex>(&keyedMutex);

if (keyedMutex == nullptr) {
return FF_FAIL;
}

//Dynamically change texture size here when wxH changes
//Dynamically change texture size here when wxH changes

TESemaphore* semaphore = nullptr;
uint64_t waitValue = 0;
/*
if (TEInstanceHasTextureTransfer(instance, TETextureToSend) == false)
{
result = TEInstanceAddTextureTransfer(instance, TETextureToSend, semaphore, waitValue);
TESemaphore* semaphore = nullptr;
uint64_t waitValue = 0;
/*
if (TEInstanceHasTextureTransfer(instance, TETextureToSend) == false)
{
result = TEInstanceAddTextureTransfer(instance, TETextureToSend, semaphore, waitValue);
if (result != TEResultSuccess)
{
return FF_FAIL;
}
}*/
result = TEInstanceGetTextureTransfer(instance, TETextureToSend, &semaphore, &waitValue);
if (result != TEResultSuccess)
{
return FF_FALSE;
}
keyedMutex->AcquireSync(waitValue, INFINITE);
Microsoft::WRL::ComPtr<ID3D11DeviceContext> devContext;
D3DDevice->GetImmediateContext(&devContext);
devContext->CopyResource(D3DTextureOutput.Get(), RawTextureToSend);
OutputInterop.WriteTexture(D3DTextureOutput.GetAddressOf());
keyedMutex->ReleaseSync(waitValue + 1);
result = TEInstanceAddTextureTransfer(instance, TETextureToSend, semaphore, waitValue + 1);
if (result != TEResultSuccess)
{
return FF_FAIL;
}
}*/
result = TEInstanceGetTextureTransfer(instance, TETextureToSend, &semaphore, &waitValue);
if (result != TEResultSuccess)
{
return FF_FALSE;
}
keyedMutex->AcquireSync(waitValue, INFINITE);
Microsoft::WRL::ComPtr<ID3D11DeviceContext> devContext;
D3DDevice->GetImmediateContext(&devContext);
devContext->CopyResource(D3DTextureOutput.Get(), RawTextureToSend);
OutputInterop.WriteTexture(D3DTextureOutput.GetAddressOf());
keyedMutex->ReleaseSync(waitValue + 1);
result = TEInstanceAddTextureTransfer(instance, TETextureToSend, semaphore, waitValue +1);
if (result != TEResultSuccess)
{
return FF_FAIL;
devContext->Flush();
devContext->Release();
keyedMutex->Release();

}
devContext->Flush();
devContext->Release();
keyedMutex->Release();

}

}

OutputInterop.ReadGLDXtexture(SpoutTexture, GL_TEXTURE_2D, OutputWidth, OutputHeight, true, pGL->HostFBO);
OutputInterop.ReadGLDXtexture(SpoutTexture, GL_TEXTURE_2D, OutputWidth, OutputHeight, true, pGL->HostFBO);

//Receiver the texture from spout
//Receiver the texture from spout

ffglex::ScopedShaderBinding shaderBinding(shader.GetGLID());
ffglex::ScopedSamplerActivation activateSampler(0);
ffglex::Scoped2DTextureBinding textureBinding(SpoutTexture);
shader.Set("InputTexture", 0);
shader.Set("MaxUV", 1.0f, 1.0f);
quad.Draw();

ffglex::ScopedShaderBinding shaderBinding(shader.GetGLID());
ffglex::ScopedSamplerActivation activateSampler(0);
ffglex::Scoped2DTextureBinding textureBinding(SpoutTexture);
shader.Set("InputTexture", 0);
shader.Set("MaxUV", 1.0f, 1.0f);
quad.Draw();




}
}


// Unbind the input texture
glBindTexture(GL_TEXTURE_2D, 0);
Expand Down
5 changes: 4 additions & 1 deletion FFGLTouchEngine/src/TouchEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class FFGLTouchEngine : public CFFGLPlugin
Microsoft::WRL::ComPtr <ID3D11Texture2D> D3DTextureOutput = nullptr;
std::map<ID3D11Texture2D*, IDXGIKeyedMutex*> TextureMutexMap;

DXGI_FORMAT DXFormat = DXGI_FORMAT_B8G8R8A8_UNORM;
GLint GLFormat = 0;

std::atomic_bool isTouchEngineLoaded = false;
std::atomic_bool isTouchEngineReady = false;
std::atomic_bool isGraphicsContextLoaded = false;
Expand Down Expand Up @@ -87,7 +90,7 @@ class FFGLTouchEngine : public CFFGLPlugin
ffglex::FFGLShader shader; //!< Utility to help us compile and link some shaders into a program.
ffglex::FFGLScreenQuad quad;//!< Utility to help us render a full screen quad.
GLuint SpoutTexture = 0;
void InitializeGlTexture(GLuint &texture, uint16_t width, uint16_t height);
void InitializeGlTexture(GLuint& texture, uint16_t width, uint16_t height, GLenum type);
void ConstructBaseParameters();
void ResetBaseParameters();

Expand Down

0 comments on commit d9f783c

Please sign in to comment.