diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
| commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
| tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/opengl/util/README-GLSL | |
| parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
| parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) | |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/opengl/util/README-GLSL')
| -rw-r--r-- | src/opengl/util/README-GLSL | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/opengl/util/README-GLSL b/src/opengl/util/README-GLSL deleted file mode 100644 index ff20eb45b2..0000000000 --- a/src/opengl/util/README-GLSL +++ /dev/null @@ -1,18 +0,0 @@ -Use of GLSL for vertex and fragment programs in Qt ---------------------------------------------------- - -We don't compile the *.glsl files because we don't want the build process of -Qt to require cgc from nVidia to build the fragment programs. - -The script src/opengl/util/glsl_to_include.sh will compile a GLSL program to a file -that can be included in a C(++) program. The file is the output from cgc -quoted as a string. - -This can be done manually by: - -./glsl_to_include.sh radial.glsl -./glsl_to_include.sh conical.glsl - -This will produce the files radial.frag and radial.glsl_quoted. -(and also conical.frag and conical.glsl_quoted) -These files are included by qpaintengine_opengl.cpp |