mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-09 05:27:49 +00:00
Make dawn_wire a shared library
Also moves the TerribleCommandBuffer to utils:: because it isn't part of the implementation of the wire, renames dawn::wire to dawn_wire, moves src/wire to src/dawn_wire and puts the interface of dawn_wire in src/include/dawn_wire.
This commit is contained in:
committed by
Corentin Wallez
parent
012c149fd9
commit
bdc867713a
@@ -17,7 +17,7 @@
|
||||
#include "common/Assert.h"
|
||||
#include "common/Platform.h"
|
||||
#include "utils/BackendBinding.h"
|
||||
#include "wire/TerribleCommandBuffer.h"
|
||||
#include "utils/TerribleCommandBuffer.h"
|
||||
|
||||
#include <dawn/dawn.h>
|
||||
#include <dawn/dawncpp.h>
|
||||
@@ -60,10 +60,10 @@ static utils::BackendBinding* binding = nullptr;
|
||||
|
||||
static GLFWwindow* window = nullptr;
|
||||
|
||||
static dawn::wire::CommandHandler* wireServer = nullptr;
|
||||
static dawn::wire::CommandHandler* wireClient = nullptr;
|
||||
static dawn::wire::TerribleCommandBuffer* c2sBuf = nullptr;
|
||||
static dawn::wire::TerribleCommandBuffer* s2cBuf = nullptr;
|
||||
static dawn_wire::CommandHandler* wireServer = nullptr;
|
||||
static dawn_wire::CommandHandler* wireClient = nullptr;
|
||||
static utils::TerribleCommandBuffer* c2sBuf = nullptr;
|
||||
static utils::TerribleCommandBuffer* s2cBuf = nullptr;
|
||||
|
||||
dawn::Device CreateCppDawnDevice() {
|
||||
binding = utils::CreateBinding(backendType);
|
||||
@@ -98,15 +98,15 @@ dawn::Device CreateCppDawnDevice() {
|
||||
|
||||
case CmdBufType::Terrible:
|
||||
{
|
||||
c2sBuf = new dawn::wire::TerribleCommandBuffer();
|
||||
s2cBuf = new dawn::wire::TerribleCommandBuffer();
|
||||
c2sBuf = new utils::TerribleCommandBuffer();
|
||||
s2cBuf = new utils::TerribleCommandBuffer();
|
||||
|
||||
wireServer = dawn::wire::NewServerCommandHandler(backendDevice, backendProcs, s2cBuf);
|
||||
wireServer = dawn_wire::NewServerCommandHandler(backendDevice, backendProcs, s2cBuf);
|
||||
c2sBuf->SetHandler(wireServer);
|
||||
|
||||
dawnDevice clientDevice;
|
||||
dawnProcTable clientProcs;
|
||||
wireClient = dawn::wire::NewClientDevice(&clientProcs, &clientDevice, c2sBuf);
|
||||
wireClient = dawn_wire::NewClientDevice(&clientProcs, &clientDevice, c2sBuf);
|
||||
s2cBuf->SetHandler(wireClient);
|
||||
|
||||
procs = clientProcs;
|
||||
|
||||
Reference in New Issue
Block a user