Skip to content

Commit ccc026f

Browse files
Bullet example has a bug, remove ex 19
1 parent 8ea64c9 commit ccc026f

File tree

7 files changed

+8
-503
lines changed

7 files changed

+8
-503
lines changed

examples_tests/14.ComputeScan/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ComputeScanApp : public NonGraphicalApplicationBase
2222
{
2323
CommonAPI::InitOutput initOutput;
2424
initOutput.system = core::smart_refctd_ptr(system);
25-
CommonAPI::InitWithNoExt(initOutput, video::EAT_OPENGL_ES, "Subgroup Arithmetic Test");
25+
CommonAPI::InitWithNoExt(initOutput, video::EAT_OPENGL, "Subgroup Arithmetic Test");
2626
system = std::move(initOutput.system);
2727
auto gl = std::move(initOutput.apiConnection);
2828
auto logger = std::move(initOutput.logger);

examples_tests/17.SimpleBulletIntegration/main.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ class BulletSampleApp : public ApplicationBase
520520
asset::SPushConstantRange range[1] = { asset::IShader::ESS_VERTEX,0u,sizeof(core::matrix4SIMD) };
521521
cpuLayout = core::make_smart_refctd_ptr<asset::ICPUPipelineLayout>(range, range + 1u, std::move(dsLayout));
522522
}
523+
cpu2gpuParams.beginCommandBuffers();
523524
m_gpuLayout = CPU2GPU.getGPUObjectsFromAssets(&cpuLayout.get(), &cpuLayout.get() + 1, cpu2gpuParams)->front();
524525

525526
{
@@ -648,6 +649,8 @@ class BulletSampleApp : public ApplicationBase
648649

649650
GPUObject ret = {};
650651
ret.pool = pool;
652+
cpu2gpuParams.waitForCreationToComplete(true);
653+
cpu2gpuParams.beginCommandBuffers();
651654
// get the mesh
652655
ret.gpuMesh = CPU2GPU.getGPUObjectsFromAssets(&cpuMesh, &cpuMesh + 1, cpu2gpuParams)->front();
653656
asset::SBufferBinding<video::IGPUBuffer> instanceRedirectBufBnd;

examples_tests/19.SIMDmatrixMultiplication/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)