forked from mirrors/principia
Remove "non-cool" pipeline in pipeline.c
The "cool" pipeline seems to have been made for GLEW, but it works on platforms that do not use GLEW too.
This commit is contained in:
ROllerozxa
parent
2d33dd7717
commit
5d042da129
1 changed files with 10 additions and 113 deletions
|
|
@ -1,51 +1,16 @@
|
|||
#include "pipeline.h"
|
||||
#include "framebuffer.h"
|
||||
#include "shader.h"
|
||||
#include "err.h"
|
||||
#include <tms/backend/opengl.h>
|
||||
|
||||
#pragma GCC push_options
|
||||
#pragma GCC optimize ("O0")
|
||||
|
||||
static struct tms_pipeline pipelines[TMS_NUM_PIPELINES] = {0};
|
||||
static int n_local_uniforms = 0;
|
||||
|
||||
#if defined(TMS_BACKEND_PC) || !defined(TMS_BACKEND_LINUX_SS)
|
||||
// Some things in the pipeline are different for Windows/Linux as compared to Android (GL/GLES differences? dunno)
|
||||
// The desktop pipeline is the "cool" pipeline as decided by me.
|
||||
#define TMS_COOL_PIPELINE
|
||||
#endif
|
||||
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
|
||||
typedef void (*TMS_UNIFORM_FN)(GLint, GLsizei, const GLfloat*);
|
||||
typedef void (*TMS_UNIFORM_MAT_FN)(GLint, GLsizei, GLboolean, const GLfloat*);
|
||||
|
||||
TMS_UNIFORM_FN uniform_fn[7];
|
||||
TMS_UNIFORM_MAT_FN uniform_mat_fn[5];
|
||||
|
||||
#else
|
||||
|
||||
void (*uniform_fn[])(GLint, GLsizei, void *) = {
|
||||
0,
|
||||
glUniform4fv,
|
||||
glUniform3fv,
|
||||
glUniform1iv,
|
||||
glUniform2fv,
|
||||
glUniform1fv,
|
||||
glUniform1iv,
|
||||
};
|
||||
|
||||
void (*uniform_mat_fn[])(GLint, GLsizei, GLboolean, void *) = {
|
||||
glUniformMatrix4fv,
|
||||
glUniformMatrix3fv,
|
||||
glUniformMatrix4fv,
|
||||
glUniformMatrix4fv,
|
||||
glUniformMatrix4fv,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
struct tms_pipeline *tms_get_pipeline(int num)
|
||||
{
|
||||
tms_assertf(num < TMS_NUM_PIPELINES, "%d > TMS_NUM_PIPELINES (%d)", num, TMS_NUM_PIPELINES);
|
||||
|
|
@ -56,7 +21,6 @@ struct tms_pipeline *tms_get_pipeline(int num)
|
|||
void
|
||||
tms_pipeline_init()
|
||||
{
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
uniform_fn[0] = 0;
|
||||
uniform_fn[1] = glUniform4fv;
|
||||
uniform_fn[2] = glUniform3fv;
|
||||
|
|
@ -70,7 +34,6 @@ tms_pipeline_init()
|
|||
uniform_mat_fn[2] = glUniformMatrix4fv;
|
||||
uniform_mat_fn[3] = glUniformMatrix4fv;
|
||||
uniform_mat_fn[4] = glUniformMatrix4fv;
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -102,15 +65,9 @@ tms_pipeline_begin_render(int p)
|
|||
{
|
||||
n_local_uniforms = 0;
|
||||
|
||||
//glFinish();
|
||||
//Uint32 t = SDL_GetTicks();
|
||||
|
||||
if (pipelines[p].fb)
|
||||
tms_fb_bind(pipelines[p].fb);
|
||||
|
||||
//glFinish();
|
||||
//tms_infof("bind time: %u", SDL_GetTicks()-t);
|
||||
|
||||
if (pipelines[p].begin_fn != 0)
|
||||
pipelines[p].begin_fn();
|
||||
}
|
||||
|
|
@ -122,14 +79,8 @@ tms_pipeline_end_render(int p)
|
|||
if (pipelines[p].end_fn != 0)
|
||||
pipelines[p].end_fn();
|
||||
|
||||
//glFinish();
|
||||
//Uint32 t = SDL_GetTicks();
|
||||
|
||||
if (pipelines[p].fb)
|
||||
tms_fb_unbind(pipelines[p].fb);
|
||||
|
||||
//glFinish();
|
||||
//tms_infof("unbind time: %u", SDL_GetTicks()-t);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -156,22 +107,9 @@ tms_pipeline_apply_combined_uniforms(int p,
|
|||
if (loc == -1)
|
||||
continue;
|
||||
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
if (pipelines[p].combined[x].type1 == TMS_MAT4 && pipelines[p].combined[x].type2 == TMS_MAT4) {
|
||||
|
||||
float *m1 = (float*)(((char*)(state->data)) + pipelines[p].combined[x].offs1);
|
||||
float *m2 = (float*)(((char*)(e)) + pipelines[p].combined[x].offs2);
|
||||
|
||||
tmat4_copy(mat, m1);
|
||||
tmat4_multiply(mat, m2);
|
||||
|
||||
glUniformMatrix4fv(loc, 1, 0, mat);
|
||||
}
|
||||
#else
|
||||
struct uniform_combined *u = &pipelines[p].combined[x];
|
||||
|
||||
if (u->type1 == TMS_MAT4 && u->type2 == TMS_MAT4) {
|
||||
|
||||
float *m1 = (float*)(((char*)(state->data)) + u->offs1);
|
||||
float *m2 = (float*)(((char*)(e)) + u->offs2);
|
||||
|
||||
|
|
@ -180,7 +118,6 @@ tms_pipeline_apply_combined_uniforms(int p,
|
|||
|
||||
glUniformMatrix4fv(loc, 1, 0, mat);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -190,15 +127,14 @@ void apply_global_uniform(struct tms_pipeline *p, int x, struct tms_rstate *stat
|
|||
return;
|
||||
}
|
||||
|
||||
if (p->global[x].type == TMS_P) {
|
||||
glUniformMatrix4fv(loc, 1, 0, state->projection);
|
||||
} else if (p->global[x].type >= 128)
|
||||
(uniform_mat_fn[p->global[x].type - 128])(loc, 1, 0, (const GLfloat *)(((char*)(state->data))+p->global[x].offs));
|
||||
else {
|
||||
(uniform_fn[p->global[x].type])(loc, 1, (const GLfloat *)(((char*)(state->data))+p->global[x].offs));
|
||||
}
|
||||
struct uniform *u = &p->global[x];
|
||||
|
||||
return;
|
||||
if (u->type == TMS_P)
|
||||
glUniformMatrix4fv(loc, 1, 0, state->projection);
|
||||
else if (u->type >= 128)
|
||||
(uniform_mat_fn[u->type - 128])(loc, 1, 0, (const GLfloat *)(((char*)(state->data))+u->offs));
|
||||
else
|
||||
(uniform_fn[u->type])(loc, 1, (const GLfloat *)(((char*)(state->data))+u->offs));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -206,38 +142,13 @@ tms_pipeline_apply_global_uniforms(int p,
|
|||
struct tms_rstate *state,
|
||||
struct tms_program *s)
|
||||
{
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
|
||||
GLuint loc;
|
||||
int x = pipelines[p].num_global - 1;
|
||||
|
||||
struct tms_pipeline *pl = tms_get_pipeline(p);
|
||||
|
||||
while (x >= 0) {
|
||||
loc = s->p_global[x];
|
||||
apply_global_uniform(pl, x, state, loc);
|
||||
x--;
|
||||
}
|
||||
|
||||
#else
|
||||
GLuint *locs = s->p_global;
|
||||
for (int x=0; x<pipelines[p].num_global; x++) {
|
||||
GLuint loc = locs[x];
|
||||
|
||||
if (loc == -1)
|
||||
continue;
|
||||
|
||||
struct uniform *u = &pipelines[p].global[x];
|
||||
|
||||
if (u->type == TMS_P) {
|
||||
glUniformMatrix4fv(loc, 1, 0, state->projection);
|
||||
} else if (u->type >= 128)
|
||||
(uniform_mat_fn[u->type - 128])(loc, 1, 0, ((char*)(state->data))+u->offs);
|
||||
else {
|
||||
(uniform_fn[u->type])(loc, 1, ((char*)(state->data))+u->offs);
|
||||
}
|
||||
apply_global_uniform(pl, x, state, loc);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -246,15 +157,10 @@ tms_pipeline_apply_local_uniforms(int p,
|
|||
struct tms_program *s,
|
||||
struct tms_entity *e)
|
||||
{
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
for (int x=0; x<pipelines[p].num_local; x++) {
|
||||
GLuint loc = s->p_local[x];
|
||||
#else
|
||||
GLuint *locs = s->p_local;
|
||||
|
||||
for (int x=0; x<pipelines[p].num_local; x++) {
|
||||
GLuint loc = locs[x];
|
||||
#endif
|
||||
|
||||
if (loc == -1)
|
||||
continue;
|
||||
|
|
@ -272,16 +178,9 @@ tms_pipeline_apply_local_uniforms(int p,
|
|||
tmat4_multiply(tmp, state->modelview);
|
||||
glUniformMatrix4fv(loc, 1, 0, tmp);
|
||||
|
||||
} else if (u->type >= 128) {
|
||||
#ifdef TMS_COOL_PIPELINE
|
||||
if (u->type == TMS_MAT3)
|
||||
glUniformMatrix3fv(loc, 1, 0, (const GLfloat *)((char *)(e) + (u->offs)));
|
||||
else
|
||||
glUniformMatrix4fv(loc, 1, 0, (const GLfloat *)((char *)(e) + (u->offs)));
|
||||
#else
|
||||
} else if (u->type >= 128)
|
||||
(uniform_mat_fn[u->type - 128])(loc, 1, 0, (const GLfloat *)((char *)(e) + (u->offs)));
|
||||
#endif
|
||||
} else
|
||||
else
|
||||
(uniform_fn[u->type])(loc, 1, (const GLfloat *)((char*)(e))+u->offs);
|
||||
}
|
||||
}
|
||||
|
|
@ -329,5 +228,3 @@ tms_pipeline_declare_combined(int pipeline, const char *name, int type1, uintptr
|
|||
|
||||
p->num_combined ++;
|
||||
}
|
||||
|
||||
#pragma GCC pop_options
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue