mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-29 17:08:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

small cleanup pass on graphic asserts/errors

Browse Source
This commit is contained in:
Noel Berry 2020-12-31 00:59:34 -08:00
parent c22b5a7639
commit c841bd82a1
7 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/blah/graphics/framebuffer.cpp
View File

@ -31,8 +31,5 @@ FrameBufferRef FrameBuffer::create(int width, int height, const TextureFormat* a
BLAH_ASSERT(depth_count <= 1, "FrameBuffer can only have 1 Depth/Stencil Texture"); BLAH_ASSERT(depth_count <= 1, "FrameBuffer can only have 1 Depth/Stencil Texture");
BLAH_ASSERT(color_count <= BLAH_ATTACHMENTS - 1, "Exceeded maximum Color attachment count"); BLAH_ASSERT(color_count <= BLAH_ATTACHMENTS - 1, "Exceeded maximum Color attachment count");
if (color_count <= BLAH_ATTACHMENTS - 1 && depth_count <= 1 && width > 0 && height > 0)
return GraphicsBackend::create_framebuffer(width, height, attachments, attachment_count); return GraphicsBackend::create_framebuffer(width, height, attachments, attachment_count);
return FrameBufferRef();
} }

23
public/blah/graphics/renderpass.cpp
View File

@ -23,26 +23,9 @@ RenderPass::RenderPass()
void RenderPass::perform() void RenderPass::perform()
{ {
// Validate Material BLAH_ASSERT(material, "Trying to draw with an invalid Material");
if (!material) BLAH_ASSERT(material->shader(), "Trying to draw with an invalid Shader");
{ BLAH_ASSERT(mesh, "Trying to draw with an invalid Mesh");
Log::warn("Trying to draw with an invalid Material; skipping render pass");
return;
}
// Validate Shader
if (!material->shader())
{
Log::warn("Trying to draw with an invalid Shader; skipping render pass");
return;
}
// Validate Mesh
if (!mesh)
{
Log::warn("Trying to draw with an invalid Mesh; skipping render pass");
return;
}
// copy call // copy call
RenderPass pass = *this; RenderPass pass = *this;

4
public/blah/graphics/shader.cpp
View File

@ -5,6 +5,10 @@ using namespace Blah;
ShaderRef Shader::create(const ShaderData& data) ShaderRef Shader::create(const ShaderData& data)
{ {
BLAH_ASSERT(data.vertex.length() > 0, "Must provide a Vertex Shader");
BLAH_ASSERT(data.fragment.length() > 0, "Must provide a Fragment Shader");
BLAH_ASSERT(data.hlsl_attributes.size() > 0 || App::renderer() != Renderer::D3D11, "D3D11 Shaders must have hlsl_attributes assigned");
auto shader = GraphicsBackend::create_shader(&data); auto shader = GraphicsBackend::create_shader(&data);
// validate the shader // validate the shader

3
public/blah/graphics/texture.cpp
View File

@ -27,10 +27,7 @@ TextureRef Texture::create(int width, int height, TextureFormat format)
BLAH_ASSERT(width > 0 && height > 0, "Texture width and height must be larger than 0"); BLAH_ASSERT(width > 0 && height > 0, "Texture width and height must be larger than 0");
BLAH_ASSERT((int)format > (int)TextureFormat::None && (int)format < (int)TextureFormat::Count, "Invalid texture format"); BLAH_ASSERT((int)format > (int)TextureFormat::None && (int)format < (int)TextureFormat::Count, "Invalid texture format");
if (width > 0 && height > 0)
return GraphicsBackend::create_texture(width, height, format); return GraphicsBackend::create_texture(width, height, format);
return TextureRef();
} }
TextureRef Texture::create(Stream& stream) TextureRef Texture::create(Stream& stream)

58
public/blah/images/aseprite.cpp
View File

@ -3,15 +3,7 @@
#include <blah/log.h> #include <blah/log.h>
#define STBI_NO_STDIO #define STBI_NO_STDIO
#define STBI_NO_JPEG #define STBI_ONLY_ZLIB
#define STBI_NO_PNG
#define STBI_NO_BMP
#define STBI_NO_PSD
#define STBI_NO_TGA
#define STBI_NO_GIF
#define STBI_NO_HDR
#define STBI_NO_PIC
#define STBI_NO_PNM
#include <blah/third_party/stb_image.h> #include <blah/third_party/stb_image.h>
#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b))
@ -29,12 +21,12 @@ Aseprite::Aseprite()
Aseprite::Aseprite(const char* path) Aseprite::Aseprite(const char* path)
{ {
FileStream fs(path, FileMode::Read); FileStream fs(path, FileMode::Read);
Parse(fs); parse(fs);
} }
Aseprite::Aseprite(Stream& stream) Aseprite::Aseprite(Stream& stream)
{ {
Parse(stream); parse(stream);
} }
Aseprite::Aseprite(const Aseprite& src) Aseprite::Aseprite(const Aseprite& src)
@ -92,7 +84,7 @@ Aseprite::~Aseprite()
} }
void Aseprite::Parse(Stream& stream) void Aseprite::parse(Stream& stream)
{ {
if (!stream.is_readable()) if (!stream.is_readable())
{ {
@ -175,12 +167,12 @@ void Aseprite::Parse(Stream& stream)
switch (chunkType) switch (chunkType)
{ {
case Chunks::Layer: ParseLayer(stream, i); break; case Chunks::Layer: parse_layer(stream, i); break;
case Chunks::Cel: ParseCel(stream, i, chunkEnd); break; case Chunks::Cel: parse_cel(stream, i, chunkEnd); break;
case Chunks::Palette: ParsePalette(stream, i); break; case Chunks::Palette: parse_palette(stream, i); break;
case Chunks::UserData: ParseUserData(stream, i); break; case Chunks::UserData: parse_user_data(stream, i); break;
case Chunks::FrameTags: ParseTag(stream, i); break; case Chunks::FrameTags: parse_tag(stream, i); break;
case Chunks::Slice: ParseSlice(stream, i); break; case Chunks::Slice: parse_slice(stream, i); break;
default: break; default: break;
} }
@ -191,7 +183,7 @@ void Aseprite::Parse(Stream& stream)
} }
} }
void Aseprite::ParseLayer(Stream& stream, int frame) void Aseprite::parse_layer(Stream& stream, int frame)
{ {
layers.emplace_back(); layers.emplace_back();
@ -211,10 +203,10 @@ void Aseprite::ParseLayer(Stream& stream, int frame)
layer.userdata.color = 0xffffff; layer.userdata.color = 0xffffff;
layer.userdata.text = ""; layer.userdata.text = "";
last_userdata = &(layer.userdata); m_last_userdata = &(layer.userdata);
} }
void Aseprite::ParseCel(Stream& stream, int frameIndex, size_t maxPosition) void Aseprite::parse_cel(Stream& stream, int frameIndex, size_t maxPosition)
{ {
Frame& frame = frames[frameIndex]; Frame& frame = frames[frameIndex];
@ -295,15 +287,15 @@ void Aseprite::ParseCel(Stream& stream, int frameIndex, size_t maxPosition)
// draw to frame if visible // draw to frame if visible
if ((int)layers[cel.layer_index].flag & (int)LayerFlags::Visible) if ((int)layers[cel.layer_index].flag & (int)LayerFlags::Visible)
{ {
RenderCel(&cel, &frame); render_cel(&cel, &frame);
} }
cel.userdata.color = 0xffffff; cel.userdata.color = 0xffffff;
cel.userdata.text = ""; cel.userdata.text = "";
last_userdata = &(cel.userdata); m_last_userdata = &(cel.userdata);
} }
void Aseprite::ParsePalette(Stream& stream, int frame) void Aseprite::parse_palette(Stream& stream, int frame)
{ {
/* size */ stream.read<uint32_t>(Endian::Little); /* size */ stream.read<uint32_t>(Endian::Little);
auto start = stream.read<uint32_t>(Endian::Little); auto start = stream.read<uint32_t>(Endian::Little);
@ -326,26 +318,26 @@ void Aseprite::ParsePalette(Stream& stream, int frame)
} }
} }
void Aseprite::ParseUserData(Stream& stream, int frame) void Aseprite::parse_user_data(Stream& stream, int frame)
{ {
if (last_userdata != nullptr) if (m_last_userdata != nullptr)
{ {
auto flags = stream.read<uint32_t>(Endian::Little); auto flags = stream.read<uint32_t>(Endian::Little);
// has text // has text
if (flags & (1 << 0)) if (flags & (1 << 0))
{ {
last_userdata->text.set_length(stream.read<uint16_t>(Endian::Little)); m_last_userdata->text.set_length(stream.read<uint16_t>(Endian::Little));
stream.read(last_userdata->text.cstr(), last_userdata->text.length()); stream.read(m_last_userdata->text.cstr(), m_last_userdata->text.length());
} }
// has color // has color
if (flags & (1 << 1)) if (flags & (1 << 1))
last_userdata->color = stream.read<Color>(Endian::Little); m_last_userdata->color = stream.read<Color>(Endian::Little);
} }
} }
void Aseprite::ParseTag(Stream& stream, int frame) void Aseprite::parse_tag(Stream& stream, int frame)
{ {
auto count = stream.read<uint16_t>(Endian::Little); auto count = stream.read<uint16_t>(Endian::Little);
stream.seek(stream.position() + 8); stream.seek(stream.position() + 8);
@ -368,7 +360,7 @@ void Aseprite::ParseTag(Stream& stream, int frame)
} }
} }
void Aseprite::ParseSlice(Stream& stream, int frame) void Aseprite::parse_slice(Stream& stream, int frame)
{ {
int count = stream.read<uint32_t>(Endian::Little); int count = stream.read<uint32_t>(Endian::Little);
int flags = stream.read<uint32_t>(Endian::Little); int flags = stream.read<uint32_t>(Endian::Little);
@ -410,11 +402,11 @@ void Aseprite::ParseSlice(Stream& stream, int frame)
slice.userdata.color = 0xffffff; slice.userdata.color = 0xffffff;
slice.userdata.text = ""; slice.userdata.text = "";
last_userdata = &(slice.userdata); m_last_userdata = &(slice.userdata);
} }
} }
void Aseprite::RenderCel(Cel* cel, Frame* frame) void Aseprite::render_cel(Cel* cel, Frame* frame)
{ {
Layer& layer = layers[cel->layer_index]; Layer& layer = layers[cel->layer_index];

18
public/blah/images/aseprite.h
View File

@ -136,15 +136,15 @@ namespace Blah
~Aseprite(); ~Aseprite();
private: private:
UserData* last_userdata = nullptr; UserData* m_last_userdata = nullptr;
void Parse(Stream& stream); void parse(Stream& stream);
void ParseLayer(Stream& stream, int frame); void parse_layer(Stream& stream, int frame);
void ParseCel(Stream& stream, int frame, size_t maxPosition); void parse_cel(Stream& stream, int frame, size_t maxPosition);
void ParsePalette(Stream& stream, int frame); void parse_palette(Stream& stream, int frame);
void ParseUserData(Stream& stream, int frame); void parse_user_data(Stream& stream, int frame);
void ParseTag(Stream& stream, int frame); void parse_tag(Stream& stream, int frame);
void ParseSlice(Stream& stream, int frame); void parse_slice(Stream& stream, int frame);
void RenderCel(Cel* cel, Frame* frame); void render_cel(Cel* cel, Frame* frame);
}; };
} }

11
public/blah/log.h
View File

@ -10,22 +10,19 @@
#define BLAH_ERROR_FMT(message, ...) \ #define BLAH_ERROR_FMT(message, ...) \
do { Log::error(message "\n\tin file: %s:%d", __VA_ARGS__, __FILE__, __LINE__); abort(); } while(0) do { Log::error(message "\n\tin file: %s:%d", __VA_ARGS__, __FILE__, __LINE__); abort(); } while(0)
#define BLAH_ASSERT(condition, message) \
do { if (!(condition)) { BLAH_ERROR(message); } } while(0)
#else #else
#define BLAH_ERROR(message) \ #define BLAH_ERROR(message) \
Log::error(message "\n\tin file: %s:%d", __FILE__, __LINE__) Log::error(message "\n\tin file: %s:%d", __FILE__, __LINE__)
#define BLAH_ERROR_FMT(message, ...) \ #define BLAH_ERROR_FMT(message, ...) \
Log::error(message "\n\tin file: %s:%d", __VA_ARGS__, __FILE__, __LINE__) Log::error(message "\n\tin file: %s:%d", __VA_ARGS__, __FILE__, __LINE__)
#define BLAH_ASSERT(condition, message) \
do { } while(false)
#endif #endif
#define BLAH_ASSERT(condition, message) \
do { if (!(condition)) { BLAH_ERROR(message); } } while(0)
// maximum length of a print/warn/error message // maximum length of a print/warn/error message
#ifndef BLAH_MESSAGE #ifndef BLAH_MESSAGE
#define BLAH_MESSAGE 1024 #define BLAH_MESSAGE 1024