← Back to branch summary

~ubuntu-branches/ubuntu/raring/glmark2/raring

~ubuntu-branches/ubuntu/raring/glmark2/raring

« back to all changes in this revision

Viewing changes to data/shaders/bump-height.vert

Committer: Package Import Robot
Author(s): Ricardo Salveti de Araujo
Date: 2012-08-21 15:38:09 UTC
mfrom: (1.1.4)
Revision ID: package-import@ubuntu.com-20120821153809-bwux72bat8qp2n5v

Tags: 2012.08-0ubuntu1

https://launchpad.net/bugs/1039736

https://launchpad.net/bugs/842279

* New upstream release 2012.08 (LP: #1039736)
  - Avoid crashing if gl used is not >= 2.0 (LP: #842279)
* Bumping dh compatibility level to v9
* debian/control:
  - Update Standards-Version to 3.9.3.
  - Add libjpeg-dev build dependency.
  - Use libegl1-x11-dev as an build-dep alternative instead of libegl1-dev.
  - Update description of glmark2-data binary package.
* debian/copyright:
  - Refresh copyright based on the current upstrem version
* debian/rules:
  - Clean compiled python code from unpacked waflib/ directory, as
    described in http://wiki.debian.org/UnpackWaf

files added:
.pc

.pc/.quilt_patches

.pc/.quilt_series

.pc/.version

.pc/applied-patches

COPYING.SGI

README.android

android/build.xml

android/project.properties

android/res/drawable

android/res/drawable/menu_about.png

android/res/drawable/menu_delete.png

android/res/drawable/menu_load.png

android/res/drawable/menu_results.png

android/res/drawable/menu_save.png

android/res/drawable/menu_settings.png

android/res/layout

android/res/layout/activity_about.xml

android/res/layout/activity_editor.xml

android/res/layout/activity_main.xml

android/res/layout/activity_results.xml

android/res/layout/list_header.xml

android/res/layout/list_item.xml

android/res/layout/save_dialog.xml

android/res/menu

android/res/menu/main_options_menu.xml

android/res/xml

android/res/xml/preferences.xml

android/src/org/linaro/glmark2/AboutActivity.java

android/src/org/linaro/glmark2/BenchmarkListManager.java

android/src/org/linaro/glmark2/EditorActivity.java

android/src/org/linaro/glmark2/GLVisualConfig.java

android/src/org/linaro/glmark2/Glmark2Native.java

android/src/org/linaro/glmark2/MainActivity.java

android/src/org/linaro/glmark2/MainPreferencesActivity.java

android/src/org/linaro/glmark2/ResultsActivity.java

android/src/org/linaro/glmark2/SceneInfo.java

data/models/jellyfish.jobj

data/shaders/buffer-wireframe.frag

data/shaders/buffer-wireframe.vert

data/shaders/bump-height.frag

data/shaders/bump-height.vert

data/shaders/bump-normals-tangent.frag

data/shaders/bump-normals-tangent.vert

data/shaders/gradient.frag

data/shaders/gradient.vert

data/shaders/ideas-lamp-lit.frag

data/shaders/ideas-lamp-lit.vert

data/shaders/ideas-lamp-unlit.frag

data/shaders/ideas-lamp-unlit.vert

data/shaders/ideas-logo-flat.frag

data/shaders/ideas-logo-flat.vert

data/shaders/ideas-logo-shadow.frag

data/shaders/ideas-logo-shadow.vert

data/shaders/ideas-logo.frag

data/shaders/ideas-logo.vert

data/shaders/ideas-paper.frag

data/shaders/ideas-paper.vert

data/shaders/ideas-table.frag

data/shaders/ideas-table.vert

data/shaders/ideas-text.frag

data/shaders/ideas-text.vert

data/shaders/ideas-under-table.frag

data/shaders/ideas-under-table.vert

data/shaders/jellyfish.frag

data/shaders/jellyfish.vert

data/shaders/light-basic-tex-bilinear.frag

data/shaders/light-basic-texgen.vert

data/shaders/terrain-blur.frag

data/shaders/terrain-luminance.frag

data/shaders/terrain-noise.frag

data/shaders/terrain-normalmap.frag

data/shaders/terrain-overlay.frag

data/shaders/terrain-texture.vert

data/shaders/terrain.frag

data/shaders/terrain.vert

data/shaders/text-renderer.frag

data/shaders/text-renderer.vert

data/textures/asteroid-height-map.png

data/textures/asteroid-normal-map-tangent.png

data/textures/desktop-shadow-corner.png

data/textures/desktop-shadow.png

data/textures/glyph-atlas.png

data/textures/jellyfish-caustics-01.png

data/textures/jellyfish-caustics-02.png

data/textures/jellyfish-caustics-03.png

data/textures/jellyfish-caustics-04.png

data/textures/jellyfish-caustics-05.png

data/textures/jellyfish-caustics-06.png

data/textures/jellyfish-caustics-07.png

data/textures/jellyfish-caustics-08.png

data/textures/jellyfish-caustics-09.png

data/textures/jellyfish-caustics-10.png

data/textures/jellyfish-caustics-11.png

data/textures/jellyfish-caustics-12.png

data/textures/jellyfish-caustics-13.png

data/textures/jellyfish-caustics-14.png

data/textures/jellyfish-caustics-15.png

data/textures/jellyfish-caustics-16.png

data/textures/jellyfish-caustics-17.png

data/textures/jellyfish-caustics-18.png

data/textures/jellyfish-caustics-19.png

data/textures/jellyfish-caustics-20.png

data/textures/jellyfish-caustics-21.png

data/textures/jellyfish-caustics-22.png

data/textures/jellyfish-caustics-23.png

data/textures/jellyfish-caustics-24.png

data/textures/jellyfish-caustics-25.png

data/textures/jellyfish-caustics-26.png

data/textures/jellyfish-caustics-27.png

data/textures/jellyfish-caustics-28.png

data/textures/jellyfish-caustics-29.png

data/textures/jellyfish-caustics-30.png

data/textures/jellyfish-caustics-31.png

data/textures/jellyfish-caustics-32.png

data/textures/jellyfish256.png

data/textures/nasa1.png

data/textures/nasa2.png

data/textures/nasa3.png

data/textures/terrain-backgrounddetailed6.jpg

data/textures/terrain-grasslight-512-nm.jpg

data/textures/terrain-grasslight-512.jpg

src/benchmark-collection.cpp

src/benchmark-collection.h

src/default-benchmarks.h

src/gl-headers.cpp

src/gl-visual-config.cpp

src/gl-visual-config.h

src/image-reader.cpp

src/image-reader.h

src/libjpeg-turbo

src/libjpeg-turbo/README

src/libjpeg-turbo/README-turbo.txt

src/libjpeg-turbo/config.h

src/libjpeg-turbo/jaricom.c

src/libjpeg-turbo/jcapimin.c

src/libjpeg-turbo/jcapistd.c

src/libjpeg-turbo/jcarith.c

src/libjpeg-turbo/jccoefct.c

src/libjpeg-turbo/jccolext.c.inc

src/libjpeg-turbo/jccolor.c

src/libjpeg-turbo/jcdctmgr.c

src/libjpeg-turbo/jchuff.c

src/libjpeg-turbo/jchuff.h

src/libjpeg-turbo/jcinit.c

src/libjpeg-turbo/jcmainct.c

src/libjpeg-turbo/jcmarker.c

src/libjpeg-turbo/jcmaster.c

src/libjpeg-turbo/jcomapi.c

src/libjpeg-turbo/jconfig.h

src/libjpeg-turbo/jcparam.c

src/libjpeg-turbo/jcphuff.c

src/libjpeg-turbo/jcprepct.c

src/libjpeg-turbo/jcsample.c

src/libjpeg-turbo/jctrans.c

src/libjpeg-turbo/jdapimin.c

src/libjpeg-turbo/jdapistd.c

src/libjpeg-turbo/jdarith.c

src/libjpeg-turbo/jdatadst-tj.c

src/libjpeg-turbo/jdatasrc-tj.c

src/libjpeg-turbo/jdcoefct.c

src/libjpeg-turbo/jdcolext.c.inc

src/libjpeg-turbo/jdcolor.c

src/libjpeg-turbo/jdct.h

src/libjpeg-turbo/jddctmgr.c

src/libjpeg-turbo/jdhuff.c

src/libjpeg-turbo/jdhuff.h

src/libjpeg-turbo/jdinput.c

src/libjpeg-turbo/jdmainct.c

src/libjpeg-turbo/jdmarker.c

src/libjpeg-turbo/jdmaster.c

src/libjpeg-turbo/jdmerge.c

src/libjpeg-turbo/jdmrgext.c.inc

src/libjpeg-turbo/jdphuff.c

src/libjpeg-turbo/jdpostct.c

src/libjpeg-turbo/jdsample.c

src/libjpeg-turbo/jdtrans.c

src/libjpeg-turbo/jerror.c

src/libjpeg-turbo/jerror.h

src/libjpeg-turbo/jfdctflt.c

src/libjpeg-turbo/jfdctfst.c

src/libjpeg-turbo/jfdctint.c

src/libjpeg-turbo/jidctflt.c

src/libjpeg-turbo/jidctfst.c

src/libjpeg-turbo/jidctint.c

src/libjpeg-turbo/jidctred.c

src/libjpeg-turbo/jinclude.h

src/libjpeg-turbo/jmemmgr.c

src/libjpeg-turbo/jmemnobs.c

src/libjpeg-turbo/jmemsys.h

src/libjpeg-turbo/jmorecfg.h

src/libjpeg-turbo/jpegcomp.h

src/libjpeg-turbo/jpegint.h

src/libjpeg-turbo/jpeglib.h

src/libjpeg-turbo/jquant1.c

src/libjpeg-turbo/jquant2.c

src/libjpeg-turbo/jsimd.h

src/libjpeg-turbo/jsimddct.h

src/libjpeg-turbo/jutils.c

src/libjpeg-turbo/jversion.h

src/libjpeg-turbo/simd

src/libjpeg-turbo/simd/jsimd.h

src/libjpeg-turbo/simd/jsimd_arm.c

src/libjpeg-turbo/simd/jsimd_arm_neon.S

src/libmatrix/gl-if.h

src/libmatrix/log.cc

src/libmatrix/log.h

src/libmatrix/shader-source.cc

src/libmatrix/shader-source.h

src/libmatrix/test

src/libmatrix/test/basic-global-const.vert

src/libmatrix/test/basic.frag

src/libmatrix/test/basic.vert

src/libmatrix/test/const_vec_test.cc

src/libmatrix/test/const_vec_test.h

src/libmatrix/test/inverse_test.cc

src/libmatrix/test/inverse_test.h

src/libmatrix/test/libmatrix_test.cc

src/libmatrix/test/libmatrix_test.h

src/libmatrix/test/options.cc

src/libmatrix/test/shader_source_test.cc

src/libmatrix/test/shader_source_test.h

src/libmatrix/test/transpose_test.cc

src/libmatrix/test/transpose_test.h

src/libmatrix/test/util_split_test.cc

src/libmatrix/test/util_split_test.h

src/libmatrix/util.cc

src/libmatrix/util.h

src/main-loop.cpp

src/main-loop.h

src/scene-buffer.cpp

src/scene-ideas

src/scene-ideas.cpp

src/scene-ideas/a.cc

src/scene-ideas/characters.h

src/scene-ideas/d.cc

src/scene-ideas/e.cc

src/scene-ideas/i.cc

src/scene-ideas/lamp.cc

src/scene-ideas/lamp.h

src/scene-ideas/logo.cc

src/scene-ideas/logo.h

src/scene-ideas/m.cc

src/scene-ideas/n.cc

src/scene-ideas/o.cc

src/scene-ideas/s.cc

src/scene-ideas/splines.cc

src/scene-ideas/splines.h

src/scene-ideas/t.cc

src/scene-ideas/table.cc

src/scene-ideas/table.h

src/scene-jellyfish.cpp

src/scene-jellyfish.h

src/scene-terrain

src/scene-terrain.cpp

src/scene-terrain/base-renderer.cpp

src/scene-terrain/blur-renderer.cpp

src/scene-terrain/copy-renderer.cpp

src/scene-terrain/luminance-renderer.cpp

src/scene-terrain/normal-from-height-renderer.cpp

src/scene-terrain/overlay-renderer.cpp

src/scene-terrain/renderer-chain.cpp

src/scene-terrain/renderer.h

src/scene-terrain/simplex-noise-renderer.cpp

src/scene-terrain/terrain-renderer.cpp

src/scene-terrain/texture-renderer.cpp

src/text-renderer.cpp

src/text-renderer.h

waflib

waflib/Build.py

waflib/ConfigSet.py

waflib/Configure.py

waflib/Context.py

waflib/Errors.py

waflib/Logs.py

waflib/Node.py

waflib/Options.py

waflib/Runner.py

waflib/Scripting.py

waflib/Task.py

waflib/TaskGen.py

waflib/Tools

waflib/Tools/__init__.py

waflib/Tools/ar.py

waflib/Tools/asm.py

waflib/Tools/bison.py

waflib/Tools/c.py

waflib/Tools/c_aliases.py

waflib/Tools/c_config.py

waflib/Tools/c_osx.py

waflib/Tools/c_preproc.py

waflib/Tools/c_tests.py

waflib/Tools/ccroot.py

waflib/Tools/compiler_c.py

waflib/Tools/compiler_cxx.py

waflib/Tools/compiler_d.py

waflib/Tools/compiler_fc.py

waflib/Tools/cs.py

waflib/Tools/cxx.py

waflib/Tools/d.py

waflib/Tools/d_config.py

waflib/Tools/d_scan.py

waflib/Tools/dbus.py

waflib/Tools/dmd.py

waflib/Tools/errcheck.py

waflib/Tools/fc.py

waflib/Tools/fc_config.py

waflib/Tools/fc_scan.py

waflib/Tools/flex.py

waflib/Tools/g95.py

waflib/Tools/gas.py

waflib/Tools/gcc.py

waflib/Tools/gdc.py

waflib/Tools/gfortran.py

waflib/Tools/glib2.py

waflib/Tools/gnu_dirs.py

waflib/Tools/gxx.py

waflib/Tools/icc.py

waflib/Tools/icpc.py

waflib/Tools/ifort.py

waflib/Tools/intltool.py

waflib/Tools/irixcc.py

waflib/Tools/javaw.py

waflib/Tools/kde4.py

waflib/Tools/lua.py

waflib/Tools/msvc.py

waflib/Tools/nasm.py

waflib/Tools/perl.py

waflib/Tools/python.py

waflib/Tools/qt4.py

waflib/Tools/ruby.py

waflib/Tools/suncc.py

waflib/Tools/suncxx.py

waflib/Tools/tex.py

waflib/Tools/vala.py

waflib/Tools/waf_unit_test.py

waflib/Tools/winres.py

waflib/Tools/xlc.py

waflib/Tools/xlcxx.py

waflib/Utils.py

waflib/__init__.py

waflib/ansiterm.py

waflib/extras

waflib/extras/__init__.py

waflib/extras/compat15.py

waflib/fixpy2.py

files removed:
android/default.properties

src/libmatrix/matrix_inverse_test.cc

src/log.cpp

src/log.h

src/shader-source.cpp

src/shader-source.h

src/util.cpp

src/util.h

files modified:
NEWS

android/AndroidManifest.xml

android/jni/Android.mk

android/jni/Android.ndk.mk

android/res/values/strings.xml

android/src/org/linaro/glmark2/Glmark2Activity.java

android/src/org/linaro/glmark2/Glmark2SurfaceView.java

data/shaders/bump-normals.frag

data/shaders/bump-normals.vert

data/shaders/bump-poly.frag

data/shaders/bump-poly.vert

data/shaders/desktop-blur.frag

data/shaders/desktop.vert

data/shaders/effect-2d-convolution.frag

data/shaders/effect-2d.vert

data/shaders/light-advanced.frag

data/shaders/light-advanced.vert

data/shaders/light-basic.frag

data/shaders/light-basic.vert

data/shaders/light-phong.frag

data/shaders/light-phong.vert

data/shaders/pulsar-light.vert

data/shaders/pulsar.vert

debian/changelog

debian/compat

debian/control

debian/copyright

debian/rules

doc/glmark2.1.in

doc/wscript_build

src/android.cpp

src/benchmark.cpp

src/benchmark.h

src/canvas-android.cpp

src/canvas-android.h

src/canvas-x11-egl.cpp

src/canvas-x11-egl.h

src/canvas-x11-glx.cpp

src/canvas-x11-glx.h

src/canvas-x11.cpp

src/canvas-x11.h

src/canvas.h

src/gl-headers.h

src/libmatrix/Makefile

src/libmatrix/mat.h

src/libmatrix/program.cc

src/libmatrix/program.h

src/libmatrix/vec.h

src/main.cpp

src/mesh.cpp

src/mesh.h

src/model.cpp

src/model.h

src/options.cpp

src/options.h

src/scene-build.cpp

src/scene-bump.cpp

src/scene-conditionals.cpp

src/scene-default-options.cpp

src/scene-desktop.cpp

src/scene-effect-2d.cpp

src/scene-function.cpp

src/scene-grid.cpp

src/scene-loop.cpp

src/scene-pulsar.cpp

src/scene-shading.cpp

src/scene-texture.cpp

src/scene.cpp

src/scene.h

src/texture.cpp

src/texture.h

src/wscript_build

waf

wscript

Show diffs side-by-side

added added

removed removed

data/shaders/bump-height.vert

1

attribute vec3 position;

2

attribute vec2 texcoord;

3

attribute vec3 normal;

4

attribute vec3 tangent;

5

6

uniform mat4 ModelViewProjectionMatrix;

7

uniform mat4 NormalMatrix;

8

9

varying vec2 TextureCoord;

10

varying vec3 NormalEye;

11

varying vec3 TangentEye;

12

varying vec3 BitangentEye;

13

14

void main(void)

15

{

16

TextureCoord = texcoord;

17

18

// Transform normal, tangent and bitangent to eye space, keeping

19

// all of them perpendicular to the Normal. That is why we use

20

// NormalMatrix, instead of ModelView, to transform the tangent and

21

// bitangent.

22

NormalEye = normalize(vec3(NormalMatrix * vec4(normal, 1.0)));

23

TangentEye = normalize(vec3(NormalMatrix * vec4(tangent, 1.0)));

24

BitangentEye = normalize(vec3(NormalMatrix * vec4(cross(normal, tangent), 1.0)));

25

26

// Transform the position to clip coordinates

27

gl_Position = ModelViewProjectionMatrix * vec4(position, 1.0);

28

}

Older »