Commit d91d15bd by Jamie Madill Committed by Commit Bot

D3D11: Don't use ErrorOrResult in TransformFeedback11.

Unblocks further return value refactoring for perf. Bug: angleproject:2738 Change-Id: Ie92aa656736f84b4e4ef6d4ab8e0377ad4afb2af Reviewed-on: https://chromium-review.googlesource.com/1142955Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 02b5328b
...@@ -3329,7 +3329,7 @@ gl::Error StateManager11::syncTransformFeedbackBuffers(const gl::Context *contex ...@@ -3329,7 +3329,7 @@ gl::Error StateManager11::syncTransformFeedbackBuffers(const gl::Context *contex
} }
const std::vector<ID3D11Buffer *> *soBuffers = nullptr; const std::vector<ID3D11Buffer *> *soBuffers = nullptr;
ANGLE_TRY_RESULT(tf11->getSOBuffers(context), soBuffers); ANGLE_TRY(tf11->getSOBuffers(context, &soBuffers));
const std::vector<UINT> &soOffsets = tf11->getSOBufferOffsets(); const std::vector<UINT> &soOffsets = tf11->getSOBufferOffsets();
deviceContext->SOSetTargets(tf11->getNumSOBuffers(), soBuffers->data(), soOffsets.data()); deviceContext->SOSetTargets(tf11->getNumSOBuffers(), soBuffers->data(), soOffsets.data());
......
...@@ -100,8 +100,8 @@ UINT TransformFeedback11::getNumSOBuffers() const ...@@ -100,8 +100,8 @@ UINT TransformFeedback11::getNumSOBuffers() const
return static_cast<UINT>(mBuffers.size()); return static_cast<UINT>(mBuffers.size());
} }
gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> TransformFeedback11::getSOBuffers( gl::Error TransformFeedback11::getSOBuffers(const gl::Context *context,
const gl::Context *context) const std::vector<ID3D11Buffer *> **buffersOut)
{ {
for (size_t bindingIdx = 0; bindingIdx < mBuffers.size(); bindingIdx++) for (size_t bindingIdx = 0; bindingIdx < mBuffers.size(); bindingIdx++)
{ {
...@@ -114,7 +114,8 @@ gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> TransformFeedback11::getS ...@@ -114,7 +114,8 @@ gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> TransformFeedback11::getS
} }
} }
return &mBuffers; *buffersOut = &mBuffers;
return gl::NoError();
} }
const std::vector<UINT> &TransformFeedback11::getSOBufferOffsets() const const std::vector<UINT> &TransformFeedback11::getSOBufferOffsets() const
......
...@@ -41,7 +41,8 @@ class TransformFeedback11 : public TransformFeedbackImpl ...@@ -41,7 +41,8 @@ class TransformFeedback11 : public TransformFeedbackImpl
bool isDirty() const; bool isDirty() const;
UINT getNumSOBuffers() const; UINT getNumSOBuffers() const;
gl::ErrorOrResult<const std::vector<ID3D11Buffer *> *> getSOBuffers(const gl::Context *context); gl::Error getSOBuffers(const gl::Context *context,
const std::vector<ID3D11Buffer *> **buffersOut);
const std::vector<UINT> &getSOBufferOffsets() const; const std::vector<UINT> &getSOBufferOffsets() const;
Serial getSerial() const; Serial getSerial() const;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment