mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-19 20:34:26 +01:00
Merge pull request #232 from unknownbrackets/glsl-fix
Add the prelude to fragment shaders
This commit is contained in:
commit
6af33015d0
2 files changed
+22
-5
No files matched your search
+12
-4
@@ -96,16 +96,24 @@ void Thin3DContext::CreatePresets() {
|
||||
|
||||
Thin3DContext::~Thin3DContext() {
|
||||
for (int i = 0; i < VS_MAX_PRESET; i++) {
|
||||
vsPresets_[i]->Release();
|
||||
if (vsPresets_[i]) {
|
||||
vsPresets_[i]->Release();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < FS_MAX_PRESET; i++) {
|
||||
fsPresets_[i]->Release();
|
||||
if (fsPresets_[i]) {
|
||||
fsPresets_[i]->Release();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < BS_MAX_PRESET; i++) {
|
||||
bsPresets_[i]->Release();
|
||||
if (bsPresets_[i]) {
|
||||
bsPresets_[i]->Release();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < SS_MAX_PRESET; i++) {
|
||||
ssPresets_[i]->Release();
|
||||
if (ssPresets_[i]) {
|
||||
ssPresets_[i]->Release();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+10
-1
@@ -160,6 +160,14 @@ private:
|
||||
|
||||
bool Thin3DGLShader::Compile(const char *source) {
|
||||
shader_ = glCreateShader(type_);
|
||||
|
||||
std::string temp;
|
||||
// Add the prelude on automatically for fragment shaders.
|
||||
if (type_ == GL_FRAGMENT_SHADER) {
|
||||
temp = std::string(glsl_fragment_prelude) + source;
|
||||
source = temp.c_str();
|
||||
}
|
||||
|
||||
glShaderSource(shader_, 1, &source, 0);
|
||||
glCompileShader(shader_);
|
||||
GLint success;
|
||||
@@ -446,10 +454,11 @@ Thin3DBuffer *Thin3DGLContext::CreateBuffer(size_t size, uint32_t usageFlags) {
|
||||
}
|
||||
|
||||
Thin3DShaderSet *Thin3DGLContext::CreateShaderSet(Thin3DShader *vshader, Thin3DShader *fshader) {
|
||||
Thin3DGLShaderSet *shaderSet = new Thin3DGLShaderSet();
|
||||
if (!vshader || !fshader) {
|
||||
ELOG("ShaderSet requires both a valid vertex and a fragment shader: %p %p", vshader, fshader);
|
||||
return NULL;
|
||||
}
|
||||
Thin3DGLShaderSet *shaderSet = new Thin3DGLShaderSet();
|
||||
vshader->AddRef();
|
||||
fshader->AddRef();
|
||||
shaderSet->vshader = static_cast<Thin3DGLShader *>(vshader);
|
||||
|
||||
Reference in new issue
Block a user