yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kwin: Move the scene shaders into shaders/1.10

Browse source
This commit is contained in:
Fredrik Höglund 2013-03-13 17:21:53 +01:00
parent fe559c2f2c
commit 79db2fc98a
9 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lanczosfilter.cpp
View file

@ -84,7 +84,7 @@ void LanczosFilter::init()
if (gl->isRadeon() && gl->chipClass() < R600) if (gl->isRadeon() && gl->chipClass() < R600)
return; return;
} }
m_shader.reset(ShaderManager::instance()->loadFragmentShader(ShaderManager::SimpleShader, ":/resources/lanczos-fragment.glsl")); m_shader.reset(ShaderManager::instance()->loadFragmentShader(ShaderManager::SimpleShader, ":/resources/shaders/1.10/lanczos-fragment.glsl"));
if (m_shader->isValid()) { if (m_shader->isValid()) {
ShaderBinder binder(m_shader.data()); ShaderBinder binder(m_shader.data());
m_uTexUnit = m_shader->uniformLocation("texUnit"); m_uTexUnit = m_shader->uniformLocation("texUnit");

24
libkwineffects/kwinglutils.cpp
View file

@ -791,9 +791,9 @@ void ShaderManager::popShader()
GLShader *ShaderManager::loadFragmentShader(ShaderType vertex, const QString &fragmentFile) GLShader *ShaderManager::loadFragmentShader(ShaderType vertex, const QString &fragmentFile)
{ {
const char *vertexFile[] = { const char *vertexFile[] = {
":/resources/scene-vertex.glsl", ":/resources/shaders/1.10/scene-vertex.glsl",
":/resources/scene-generic-vertex.glsl", ":/resources/shaders/1.10/scene-generic-vertex.glsl",
":/resources/scene-color-vertex.glsl" ":/resources/shaders/1.10/scene-color-vertex.glsl"
}; };
GLShader *shader = new GLShader(vertexFile[vertex], fragmentFile); GLShader *shader = new GLShader(vertexFile[vertex], fragmentFile);
@ -811,9 +811,9 @@ GLShader *ShaderManager::loadVertexShader(ShaderType fragment, const QString &ve
{ {
// The Simple and Generic shaders use same fragment shader // The Simple and Generic shaders use same fragment shader
const char *fragmentFile[] = { const char *fragmentFile[] = {
":/resources/scene-fragment.glsl", ":/resources/shaders/1.10/scene-fragment.glsl",
":/resources/scene-fragment.glsl", ":/resources/shaders/1.10/scene-fragment.glsl",
":/resources/scene-color-fragment.glsl" ":/resources/shaders/1.10/scene-color-fragment.glsl"
}; };
GLShader *shader = new GLShader(vertexFile, fragmentFile[fragment]); GLShader *shader = new GLShader(vertexFile, fragmentFile[fragment]);
@ -837,15 +837,15 @@ GLShader *ShaderManager::loadShaderFromCode(const QByteArray &vertexSource, cons
void ShaderManager::initShaders() void ShaderManager::initShaders()
{ {
const char *vertexFile[] = { const char *vertexFile[] = {
":/resources/scene-vertex.glsl", ":/resources/shaders/1.10/scene-vertex.glsl",
":/resources/scene-generic-vertex.glsl", ":/resources/shaders/1.10/scene-generic-vertex.glsl",
":/resources/scene-color-vertex.glsl", ":/resources/shaders/1.10/scene-color-vertex.glsl",
}; };
const char *fragmentFile[] = { const char *fragmentFile[] = {
":/resources/scene-fragment.glsl", ":/resources/shaders/1.10/scene-fragment.glsl",
":/resources/scene-fragment.glsl", ":/resources/shaders/1.10/scene-fragment.glsl",
":/resources/scene-color-fragment.glsl", ":/resources/shaders/1.10/scene-color-fragment.glsl",
}; };
// Be optimistic // Be optimistic

12
resources.qrc
View file

@ -1,10 +1,10 @@
<!DOCTYPE RCC><RCC version="1.0"> <!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/resources"> <qresource prefix="/resources">
<file>lanczos-fragment.glsl</file> <file>shaders/1.10/lanczos-fragment.glsl</file>
<file>scene-vertex.glsl</file> <file>shaders/1.10/scene-vertex.glsl</file>
<file>scene-fragment.glsl</file> <file>shaders/1.10/scene-fragment.glsl</file>
<file>scene-color-vertex.glsl</file> <file>shaders/1.10/scene-color-vertex.glsl</file>
<file>scene-color-fragment.glsl</file> <file>shaders/1.10/scene-color-fragment.glsl</file>
<file>scene-generic-vertex.glsl</file> <file>shaders/1.10/scene-generic-vertex.glsl</file>
</qresource> </qresource>
</RCC> </RCC>

0
lanczos-fragment.glsl → shaders/1.10/lanczos-fragment.glsl
View file

0
scene-color-fragment.glsl → shaders/1.10/scene-color-fragment.glsl
View file

0
scene-color-vertex.glsl → shaders/1.10/scene-color-vertex.glsl
View file

0
scene-fragment.glsl → shaders/1.10/scene-fragment.glsl
View file

0
scene-generic-vertex.glsl → shaders/1.10/scene-generic-vertex.glsl
View file

0
scene-vertex.glsl → shaders/1.10/scene-vertex.glsl
View file