Skip to content

Commit

Permalink
pipeline improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikai B committed Jan 19, 2025
1 parent fb27f8a commit 99d36ea
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 6 deletions.
6 changes: 6 additions & 0 deletions genesis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ GsPipeline *gs_create_pipeline() {
GsPipeline *pipeline = GS_ALLOC(GsPipeline);
pipeline->layout = NULL;
pipeline->program = NULL;
pipeline->blend_dst = GS_BLEND_FACTOR_ONE;
pipeline->blend_src = GS_BLEND_FACTOR_ZERO;
pipeline->blend_op = GS_BLEND_OP_ADD;
pipeline->blend_enabled = GS_FALSE;
pipeline->msaa_samples = 0; // disabled

return pipeline;
}
Expand Down Expand Up @@ -479,6 +484,7 @@ GsTexture *gs_create_texture(const int width, const int height, const GsTextureF
texture->mag = mag;
texture->type = GS_TEXTURE_TYPE_2D;
texture->handle = NULL;
texture->lodBias = 0.0f;

active_config->backend->create_texture_handle(texture);

Expand Down
32 changes: 32 additions & 0 deletions genesis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,32 @@ typedef enum {
GS_CUBEMAP_FACE_NONE
} GsCubemapFace;

typedef enum {
GS_BLEND_FACTOR_ZERO,
GS_BLEND_FACTOR_ONE,
GS_BLEND_FACTOR_SRC_COLOR,
GS_BLEND_FACTOR_ONE_MINUS_SRC_COLOR,
GS_BLEND_FACTOR_DST_COLOR,
GS_BLEND_FACTOR_ONE_MINUS_DST_COLOR,
GS_BLEND_FACTOR_SRC_ALPHA,
GS_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA,
GS_BLEND_FACTOR_DST_ALPHA,
GS_BLEND_FACTOR_ONE_MINUS_DST_ALPHA,
GS_BLEND_FACTOR_CONSTANT_COLOR,
GS_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR,
GS_BLEND_FACTOR_CONSTANT_ALPHA,
GS_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA,
GS_BLEND_FACTOR_SRC_ALPHA_SATURATE
} GsBlendFactor;

typedef enum {
GS_BLEND_OP_ADD,
GS_BLEND_OP_SUBTRACT,
GS_BLEND_OP_REVERSE_SUBTRACT,
GS_BLEND_OP_MIN,
GS_BLEND_OP_MAX
} GsBlendOp;

typedef int GsUniformLocation;

typedef struct GsBackend GsBackend;
Expand Down Expand Up @@ -233,6 +259,11 @@ typedef struct GsCommandList {
typedef struct GsPipeline {
GsVtxLayout *layout;
GsProgram *program;
GsBlendFactor blend_src;
GsBlendFactor blend_dst;
GsBlendOp blend_op;
GS_BOOL blend_enabled;
int msaa_samples;
} GsPipeline;

typedef struct GsBuffer {
Expand Down Expand Up @@ -357,6 +388,7 @@ typedef struct GsProgram {
typedef struct GsTexture {
int width;
int height;
float lodBias;
GsTextureFormat format;
GsTextureWrap wrap_s;
GsTextureWrap wrap_t;
Expand Down
81 changes: 75 additions & 6 deletions genesis_opengl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ GsBuffer* requested_index_buffer = NULL;
GsProgram* requested_program = NULL;
GsVtxLayout* requested_layout = NULL;
GsTexture** requested_textures = NULL;
GsBlendFactor blend_src = -1;
GsBlendFactor blend_dst = -1;
GsBlendOp blend_op = -1;
GS_BOOL blend_enabled = GS_FALSE;
GS_BOOL msaa_enabled = GS_FALSE;

GsBackend *gs_opengl_create() {
GsBackend *backend = GS_ALLOC(GsBackend);
Expand Down Expand Up @@ -148,6 +153,40 @@ int gs_opengl_get_buffer_intent(GsBufferIntent intent) {
return 0;
}

int gs_opengl_get_blend_factor(GsBlendFactor factor) {
switch (factor) {
case GS_BLEND_FACTOR_ZERO: return GL_ZERO;
case GS_BLEND_FACTOR_ONE: return GL_ONE;
case GS_BLEND_FACTOR_SRC_COLOR: return GL_SRC_COLOR;
case GS_BLEND_FACTOR_ONE_MINUS_SRC_COLOR: return GL_ONE_MINUS_SRC_COLOR;
case GS_BLEND_FACTOR_DST_COLOR: return GL_DST_COLOR;
case GS_BLEND_FACTOR_ONE_MINUS_DST_COLOR: return GL_ONE_MINUS_DST_COLOR;
case GS_BLEND_FACTOR_SRC_ALPHA: return GL_SRC_ALPHA;
case GS_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA: return GL_ONE_MINUS_SRC_ALPHA;
case GS_BLEND_FACTOR_DST_ALPHA: return GL_DST_ALPHA;
case GS_BLEND_FACTOR_ONE_MINUS_DST_ALPHA: return GL_ONE_MINUS_DST_ALPHA;
case GS_BLEND_FACTOR_CONSTANT_COLOR: return GL_CONSTANT_COLOR;
case GS_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR: return GL_ONE_MINUS_CONSTANT_COLOR;
case GS_BLEND_FACTOR_CONSTANT_ALPHA: return GL_CONSTANT_ALPHA;
case GS_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA: return GL_ONE_MINUS_CONSTANT_ALPHA;
case GS_BLEND_FACTOR_SRC_ALPHA_SATURATE: return GL_SRC_ALPHA_SATURATE;
}

return 0;
}

int gs_opengl_get_blend_op(GsBlendOp op) {
switch (op) {
case GS_BLEND_OP_ADD: return GL_FUNC_ADD;
case GS_BLEND_OP_SUBTRACT: return GL_FUNC_SUBTRACT;
case GS_BLEND_OP_REVERSE_SUBTRACT: return GL_FUNC_REVERSE_SUBTRACT;
case GS_BLEND_OP_MIN: return GL_MIN;
case GS_BLEND_OP_MAX: return GL_MAX;
}

return 0;
}

void gs_opengl_internal_bind_state() {
if (requested_vertex_buffer != bound_vertex_buffer) {
if (requested_vertex_buffer != NULL) {
Expand Down Expand Up @@ -491,6 +530,35 @@ void gs_opengl_cmd_use_pipeline(const GsCommandListItem item) {

gs_opengl_internal_bind_program(pipeline->program);
gs_opengl_internal_bind_layout(pipeline->layout);

if (pipeline->blend_enabled != blend_enabled) {
if (pipeline->blend_enabled) {
glEnable(GL_BLEND);
} else {
glDisable(GL_BLEND);
}

blend_enabled = pipeline->blend_enabled;
}

if (pipeline->blend_src != blend_src || pipeline->blend_dst != blend_dst || pipeline->blend_op != blend_op) {
glBlendFunc(gs_opengl_get_blend_factor(pipeline->blend_src), gs_opengl_get_blend_factor(pipeline->blend_dst));
glBlendEquation(gs_opengl_get_blend_op(pipeline->blend_op));

blend_src = pipeline->blend_src;
blend_dst = pipeline->blend_dst;
blend_op = pipeline->blend_op;
}

if (pipeline->msaa_samples > 0 && !msaa_enabled) {
glEnable(GL_MULTISAMPLE);
msaa_enabled = GS_TRUE;
}

if (pipeline->msaa_samples == 0 && msaa_enabled) {
glDisable(GL_MULTISAMPLE);
msaa_enabled = GS_FALSE;
}
}

void gs_opengl_cmd_use_texture(const GsCommandListItem item) {
Expand Down Expand Up @@ -704,14 +772,15 @@ void gs_opengl_set_texture_data(GsTexture *texture, GsCubemapFace face, void *da
GS_ASSERT(texture != NULL);
GS_ASSERT(data != NULL);

gs_opengl_internal_bind_texture(texture, 0);
gs_opengl_internal_bind_state();

glActiveTexture(GL_TEXTURE0);
glBindTexture(gs_opengl_get_texture_type(texture->type), *(GLuint*)texture->handle);
bound_textures[0] = texture;

glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, gs_opengl_get_texture_wrap(texture->wrap_s));
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, gs_opengl_get_texture_wrap(texture->wrap_t));
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gs_opengl_get_texture_filter(texture->min));
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gs_opengl_get_texture_filter(texture->mag));
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, texture->lodBias);

switch (texture->type) {
case GS_TEXTURE_TYPE_2D:
Expand All @@ -734,10 +803,10 @@ GsUniformLocation gs_opengl_get_uniform_location(GsProgram *program, const char
void gs_opengl_generate_mipmaps(GsTexture *texture) {
GS_ASSERT(texture != NULL);

gs_opengl_internal_bind_texture(texture, 0);
gs_opengl_internal_bind_state();

glActiveTexture(GL_TEXTURE0);
glBindTexture(gs_opengl_get_texture_type(texture->type), *(GLuint*)texture->handle);
bound_textures[0] = texture;

glGenerateMipmap(GL_TEXTURE_2D);
}

Expand Down

0 comments on commit 99d36ea

Please sign in to comment.