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:
Corentin Wallez
2018-07-26 15:07:57 +02:00
committed by Corentin Wallez
parent 012c149fd9
commit bdc867713a
18 changed files with 154 additions and 112 deletions

View File

@@ -21,6 +21,8 @@ list(APPEND UTILS_SOURCES
${UTILS_DIR}/DawnHelpers.h
${UTILS_DIR}/SystemUtils.cpp
${UTILS_DIR}/SystemUtils.h
${UTILS_DIR}/TerribleCommandBuffer.cpp
${UTILS_DIR}/TerribleCommandBuffer.h
)
if (DAWN_ENABLE_D3D12)

View File

@@ -0,0 +1,60 @@
// Copyright 2017 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "utils/TerribleCommandBuffer.h"
#include "common/Assert.h"
namespace utils {
TerribleCommandBuffer::TerribleCommandBuffer() {
}
TerribleCommandBuffer::TerribleCommandBuffer(dawn_wire::CommandHandler* handler)
: mHandler(handler) {
}
void TerribleCommandBuffer::SetHandler(dawn_wire::CommandHandler* handler) {
mHandler = handler;
}
void* TerribleCommandBuffer::GetCmdSpace(size_t size) {
// TODO(kainino@chromium.org): Should we early-out if size is 0?
// (Here and/or in the caller?) It might be good to make the wire receiver get a nullptr
// instead of pointer to zero-sized allocation in mBuffer.
if (size > sizeof(mBuffer)) {
return nullptr;
}
char* result = &mBuffer[mOffset];
mOffset += size;
if (mOffset > sizeof(mBuffer)) {
if (!Flush()) {
return nullptr;
}
return GetCmdSpace(size);
}
return result;
}
bool TerribleCommandBuffer::Flush() {
bool success = mHandler->HandleCommands(mBuffer, mOffset) != nullptr;
mOffset = 0;
return success;
}
} // namespace utils

View File

@@ -0,0 +1,42 @@
// Copyright 2017 The Dawn Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef UTILS_TERRIBLE_COMMAND_BUFFER_H_
#define UTILS_TERRIBLE_COMMAND_BUFFER_H_
#include <vector>
#include "dawn_wire/Wire.h"
namespace utils {
class TerribleCommandBuffer : public dawn_wire::CommandSerializer {
public:
TerribleCommandBuffer();
TerribleCommandBuffer(dawn_wire::CommandHandler* handler);
void SetHandler(dawn_wire::CommandHandler* handler);
void* GetCmdSpace(size_t size) override;
bool Flush() override;
private:
dawn_wire::CommandHandler* mHandler = nullptr;
size_t mOffset = 0;
char mBuffer[10000000];
};
} // namespace utils
#endif // UTILS_TERRIBLE_COMMAND_BUFFER_H_