diff --git a/dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj b/dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj
index 06f66a8..ce7e8ac 100644
--- a/dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj
+++ b/dev/msvc/olcPGE3_BuildSH/olcPGE3_BuildSH.vcxproj
@@ -40,7 +40,7 @@
true
true
- true
+ false
true
@@ -114,7 +114,7 @@
true
- false
+ true
true
diff --git a/dev/src/draw_batch.cpp b/dev/src/draw_batch.cpp
index da0d8e8..d5a264e 100644
--- a/dev/src/draw_batch.cpp
+++ b/dev/src/draw_batch.cpp
@@ -20,9 +20,6 @@ using namespace olc;
ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
{
- PrepareImageForHW(image);
- PrepareTargetForHW();
-
ImageBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = ℑ
@@ -31,6 +28,8 @@ ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
const GPUTask& olc::Draw::Batch(olc::ImageBatch& batch, const olc::Pixel tint)
{
+ PrepareImageForHW(*batch.task.pImage);
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
@@ -44,6 +43,7 @@ FilledBatch olc::Draw::CreateFilledBatch()
const GPUTask& olc::Draw::Batch(olc::FilledBatch& batch, const olc::Pixel tint)
{
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
@@ -57,15 +57,13 @@ LineBatch olc::Draw::CreateLineBatch()
const GPUTask& olc::Draw::Batch(olc::LineBatch& batch, const olc::Pixel tint)
{
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
{
- PrepareImageForHW(image);
- PrepareTargetForHW();
-
TextureBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = ℑ
@@ -74,6 +72,8 @@ TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
const GPUTask& olc::Draw::Batch(olc::TextureBatch& batch, const olc::Pixel tint)
{
+ PrepareImageForHW(*batch.task.pImage);
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
diff --git a/olcPixelGameEngine3.h b/olcPixelGameEngine3.h
index f873631..7836f5f 100644
--- a/olcPixelGameEngine3.h
+++ b/olcPixelGameEngine3.h
@@ -19416,9 +19416,6 @@ using namespace olc;
ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
{
- PrepareImageForHW(image);
- PrepareTargetForHW();
-
ImageBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = ℑ
@@ -19427,6 +19424,8 @@ ImageBatch olc::Draw::CreateImageBatch(olc::Image& image)
const GPUTask& olc::Draw::Batch(olc::ImageBatch& batch, const olc::Pixel tint)
{
+ PrepareImageForHW(*batch.task.pImage);
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
@@ -19440,6 +19439,7 @@ FilledBatch olc::Draw::CreateFilledBatch()
const GPUTask& olc::Draw::Batch(olc::FilledBatch& batch, const olc::Pixel tint)
{
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
@@ -19453,15 +19453,13 @@ LineBatch olc::Draw::CreateLineBatch()
const GPUTask& olc::Draw::Batch(olc::LineBatch& batch, const olc::Pixel tint)
{
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}
TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
{
- PrepareImageForHW(image);
- PrepareTargetForHW();
-
TextureBatch b;
b.task.structure = olc::Structure::List;
b.task.pImage = ℑ
@@ -19470,6 +19468,8 @@ TextureBatch olc::Draw::CreateTextureBatch(olc::Image& image)
const GPUTask& olc::Draw::Batch(olc::TextureBatch& batch, const olc::Pixel tint)
{
+ PrepareImageForHW(*batch.task.pImage);
+ PrepareTargetForHW();
batch.task.tint = tint;
return vecGPUTasks.data.emplace_back(batch.task);
}