diff options
Diffstat (limited to 'meta-steppeeagle/recipes-graphics')
18 files changed, 1589 insertions, 0 deletions
diff --git a/meta-steppeeagle/recipes-graphics/drm/libdrm/0001-radeon-add-Mullins-chip-family.patch b/meta-steppeeagle/recipes-graphics/drm/libdrm/0001-radeon-add-Mullins-chip-family.patch new file mode 100644 index 00000000..97f9c354 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/drm/libdrm/0001-radeon-add-Mullins-chip-family.patch @@ -0,0 +1,26 @@ +From 0ca3b79c21c1db04d442b09654e4cc2d7d956276 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Thu, 17 Apr 2014 14:30:08 -0400 +Subject: [PATCH 1/2] radeon: add Mullins chip family + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + radeon/radeon_surface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c +index 15127d4..109bd6b 100644 +--- a/radeon/radeon_surface.c ++++ b/radeon/radeon_surface.c +@@ -80,6 +80,7 @@ enum radeon_family { + CHIP_KAVERI, + CHIP_KABINI, + CHIP_HAWAII, ++ CHIP_MULLINS, + CHIP_LAST, + }; + +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/drm/libdrm/0002-radeon-add-Mullins-pci-ids.patch b/meta-steppeeagle/recipes-graphics/drm/libdrm/0002-radeon-add-Mullins-pci-ids.patch new file mode 100644 index 00000000..c5a22269 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/drm/libdrm/0002-radeon-add-Mullins-pci-ids.patch @@ -0,0 +1,42 @@ +From 532a41b72641791df14f3a7b49f6b9ebd9fe5022 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Tue, 12 Nov 2013 15:39:31 -0500 +Subject: [PATCH 2/2] radeon: add Mullins pci ids + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + radeon/r600_pci_ids.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/radeon/r600_pci_ids.h b/radeon/r600_pci_ids.h +index 37fb61c..de25f16 100644 +--- a/radeon/r600_pci_ids.h ++++ b/radeon/r600_pci_ids.h +@@ -425,6 +425,23 @@ CHIPSET(0x983D, KABINI_983D, KABINI) + CHIPSET(0x983E, KABINI_983E, KABINI) + CHIPSET(0x983F, KABINI_983F, KABINI) + ++CHIPSET(0x9850, MULLINS_9850, MULLINS) ++CHIPSET(0x9851, MULLINS_9851, MULLINS) ++CHIPSET(0x9852, MULLINS_9852, MULLINS) ++CHIPSET(0x9853, MULLINS_9853, MULLINS) ++CHIPSET(0x9854, MULLINS_9854, MULLINS) ++CHIPSET(0x9855, MULLINS_9855, MULLINS) ++CHIPSET(0x9856, MULLINS_9856, MULLINS) ++CHIPSET(0x9857, MULLINS_9857, MULLINS) ++CHIPSET(0x9858, MULLINS_9858, MULLINS) ++CHIPSET(0x9859, MULLINS_9859, MULLINS) ++CHIPSET(0x985A, MULLINS_985A, MULLINS) ++CHIPSET(0x985B, MULLINS_985B, MULLINS) ++CHIPSET(0x985C, MULLINS_985C, MULLINS) ++CHIPSET(0x985D, MULLINS_985D, MULLINS) ++CHIPSET(0x985E, MULLINS_985E, MULLINS) ++CHIPSET(0x985F, MULLINS_985F, MULLINS) ++ + CHIPSET(0x1304, KAVERI_1304, KAVERI) + CHIPSET(0x1305, KAVERI_1305, KAVERI) + CHIPSET(0x1306, KAVERI_1306, KAVERI) +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/drm/libdrm_git.bbappend b/meta-steppeeagle/recipes-graphics/drm/libdrm_git.bbappend new file mode 100644 index 00000000..cb5ebffd --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/drm/libdrm_git.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRCREV = "e6ec4c88519da05eccc05ed2ae7ff20277e3672a" +PV = "2.4.53+git${SRCPV}" + +SRC_URI += " \ + file://0001-radeon-add-Mullins-chip-family.patch \ + file://0002-radeon-add-Mullins-pci-ids.patch \ + " + +PATCHTOOL = "git" + +EXTRA_OECONF += "--enable-optimized \ + --disable-assertions \ + --enable-shared \ + --enable-targets=x86_64 \ + --enable-experimental-targets=R600 \ + --enable-bindings=none" diff --git a/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch new file mode 100644 index 00000000..c7851035 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch @@ -0,0 +1,623 @@ +From 87f9a62329d7c5f4d351fbb63a41f2a1935fb2f1 Mon Sep 17 00:00:00 2001 +From: Drew Moseley <drew_moseley@mentor.com> +Date: Mon, 12 May 2014 15:22:32 -0400 +Subject: [PATCH] mesa-demos: Add missing data files. + +Add some data files that are present in the git repository: + http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 +but not in the release tarball + ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 + +Upstream-Status: Backport +Signed-off-by: Drew Moseley <drew_moseley@mentor.com> +--- + src/fpglsl/depth-read.glsl | 4 + + src/fpglsl/infinite-loop.glsl | 7 + + src/glsl/CH11-bumpmaptex.frag | 47 +++++++ + src/glsl/blinking-teapot.frag | 31 +++++ + src/glsl/blinking-teapot.vert | 16 +++ + src/glsl/convolution.frag | 21 +++ + src/glsl/simplex-noise.glsl | 279 +++++++++++++++++++++++++++++++++++++++ + src/glsl/skinning.vert | 24 ++++ + src/perf/glslstateschange1.frag | 19 +++ + src/perf/glslstateschange1.vert | 14 ++ + src/perf/glslstateschange2.frag | 17 +++ + src/perf/glslstateschange2.vert | 14 ++ + src/vpglsl/infinite-loop.glsl | 8 ++ + 13 files changed, 501 insertions(+) + create mode 100644 src/fpglsl/depth-read.glsl + create mode 100644 src/fpglsl/infinite-loop.glsl + create mode 100644 src/glsl/CH11-bumpmaptex.frag + create mode 100644 src/glsl/blinking-teapot.frag + create mode 100644 src/glsl/blinking-teapot.vert + create mode 100644 src/glsl/convolution.frag + create mode 100644 src/glsl/simplex-noise.glsl + create mode 100644 src/glsl/skinning.vert + create mode 100644 src/perf/glslstateschange1.frag + create mode 100644 src/perf/glslstateschange1.vert + create mode 100644 src/perf/glslstateschange2.frag + create mode 100644 src/perf/glslstateschange2.vert + create mode 100644 src/vpglsl/infinite-loop.glsl + +diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl +new file mode 100644 +index 0000000..86d298e +--- /dev/null ++++ b/src/fpglsl/depth-read.glsl +@@ -0,0 +1,4 @@ ++void main() ++{ ++ gl_FragColor = gl_FragCoord.zzzz; ++} +diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl +new file mode 100644 +index 0000000..c6dc6ee +--- /dev/null ++++ b/src/fpglsl/infinite-loop.glsl +@@ -0,0 +1,7 @@ ++void main() { ++ vec4 sum = vec4(0); ++ for (int i = 1; i != 2; i += 2) { ++ sum += vec4(0.1, 0.1, 0.1, 0.1); ++ } ++ gl_FragColor = sum; ++} +diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag +new file mode 100644 +index 0000000..b5dabb4 +--- /dev/null ++++ b/src/glsl/CH11-bumpmaptex.frag +@@ -0,0 +1,47 @@ ++// ++// Fragment shader for procedural bumps ++// ++// Authors: John Kessenich, Randi Rost ++// ++// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. ++// ++// See 3Dlabs-License.txt for license information ++// ++// Texture mapping/modulation added by Brian Paul ++// ++ ++varying vec3 LightDir; ++varying vec3 EyeDir; ++ ++uniform float BumpDensity; // = 16.0 ++uniform float BumpSize; // = 0.15 ++uniform float SpecularFactor; // = 0.5 ++ ++uniform sampler2D Tex; ++ ++void main() ++{ ++ vec3 ambient = vec3(0.25); ++ vec3 litColor; ++ vec2 c = BumpDensity * gl_TexCoord[0].st; ++ vec2 p = fract(c) - vec2(0.5); ++ ++ float d, f; ++ d = p.x * p.x + p.y * p.y; ++ f = inversesqrt(d + 1.0); ++ ++ if (d >= BumpSize) ++ { p = vec2(0.0); f = 1.0; } ++ ++ vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; ++ ++ vec3 normDelta = vec3(p.x, p.y, 1.0) * f; ++ litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); ++ vec3 reflectDir = reflect(LightDir, normDelta); ++ ++ float spec = max(dot(EyeDir, reflectDir), 0.0); ++ spec *= SpecularFactor; ++ litColor = min(litColor + spec, vec3(1.0)); ++ ++ gl_FragColor = vec4(litColor, 1.0); ++} +diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag +new file mode 100644 +index 0000000..0db060b +--- /dev/null ++++ b/src/glsl/blinking-teapot.frag +@@ -0,0 +1,31 @@ ++#extension GL_ARB_uniform_buffer_object : enable ++ ++layout(std140) uniform colors0 ++{ ++ float DiffuseCool; ++ float DiffuseWarm; ++ vec3 SurfaceColor; ++ vec3 WarmColor; ++ vec3 CoolColor; ++ vec4 some[8]; ++}; ++ ++varying float NdotL; ++varying vec3 ReflectVec; ++varying vec3 ViewVec; ++ ++void main (void) ++{ ++ ++ vec3 kcool = min(CoolColor + DiffuseCool * SurfaceColor, 1.0); ++ vec3 kwarm = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0); ++ vec3 kfinal = mix(kcool, kwarm, NdotL); ++ ++ vec3 nreflect = normalize(ReflectVec); ++ vec3 nview = normalize(ViewVec); ++ ++ float spec = max(dot(nreflect, nview), 0.0); ++ spec = pow(spec, 32.0); ++ ++ gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0); ++} +diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert +new file mode 100644 +index 0000000..397d733 +--- /dev/null ++++ b/src/glsl/blinking-teapot.vert +@@ -0,0 +1,16 @@ ++vec3 LightPosition = vec3(0.0, 10.0, 4.0); ++ ++varying float NdotL; ++varying vec3 ReflectVec; ++varying vec3 ViewVec; ++ ++void main(void) ++{ ++ vec3 ecPos = vec3 (gl_ModelViewMatrix * gl_Vertex); ++ vec3 tnorm = normalize(gl_NormalMatrix * gl_Normal); ++ vec3 lightVec = normalize(LightPosition - ecPos); ++ ReflectVec = normalize(reflect(-lightVec, tnorm)); ++ ViewVec = normalize(-ecPos); ++ NdotL = (dot(lightVec, tnorm) + 1.0) * 0.5; ++ gl_Position = ftransform(); ++} +diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag +new file mode 100644 +index 0000000..e49b8ac +--- /dev/null ++++ b/src/glsl/convolution.frag +@@ -0,0 +1,21 @@ ++ ++const int KernelSize = 9; ++ ++//texture offsets ++uniform vec2 Offset[KernelSize]; ++//convolution kernel ++uniform vec4 KernelValue[KernelSize]; ++uniform sampler2D srcTex; ++uniform vec4 ScaleFactor; ++uniform vec4 BaseColor; ++ ++void main(void) ++{ ++ int i; ++ vec4 sum = vec4(0.0); ++ for (i = 0; i < KernelSize; ++i) { ++ vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]); ++ sum += tmp * KernelValue[i]; ++ } ++ gl_FragColor = sum * ScaleFactor + BaseColor; ++} +diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl +new file mode 100644 +index 0000000..b6833cb +--- /dev/null ++++ b/src/glsl/simplex-noise.glsl +@@ -0,0 +1,279 @@ ++// ++// Description : Array and textureless GLSL 2D/3D/4D simplex ++// noise functions. ++// Author : Ian McEwan, Ashima Arts. ++// Maintainer : ijm ++// Lastmod : 20110223 ++// License : Copyright (C) 2011 Ashima Arts. All rights reserved. ++// Distributed under the Artistic License 2.0; See LICENCE file. ++// ++ ++#define NORMALIZE_GRADIENTS ++#undef USE_CIRCLE ++#define COLLAPSE_SORTNET ++ ++float permute(float x0,vec3 p) { ++ float x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec2 permute(vec2 x0,vec3 p) { ++ vec2 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec3 permute(vec3 x0,vec3 p) { ++ vec3 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++vec4 permute(vec4 x0,vec3 p) { ++ vec4 x1 = mod(x0 * p.y, p.x); ++ return floor( mod( (x1 + p.z) *x0, p.x )); ++ } ++ ++uniform vec4 pParam; ++// Example ++// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.); ++ ++float taylorInvSqrt(float r) ++ { ++ return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r ); ++ } ++ ++float simplexNoise2(vec2 v) ++ { ++ const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.; ++ 0.366025403784438597); // 0.5*(sqrt(3.0)-1.); ++ const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312; ++// First corner ++ vec2 i = floor(v + dot(v, C.yy) ); ++ vec2 x0 = v - i + dot(i, C.xx); ++ ++// Other corners ++ vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ; ++ ++ // x0 = x0 - 0. + 0. * C ++ vec2 x1 = x0 - i1 + 1. * C.xx ; ++ vec2 x2 = x0 - 1. + 2. * C.xx ; ++ ++// Permutations ++ i = mod(i, pParam.x); ++ vec3 p = permute( permute( ++ i.y + vec3(0., i1.y, 1. ), pParam.xyz) ++ + i.x + vec3(0., i1.x, 1. ), pParam.xyz); ++ ++#ifndef USE_CIRCLE ++// ( N points uniformly over a line, mapped onto a diamond.) ++ vec3 x = fract(p / pParam.w) ; ++ vec3 h = 0.5 - abs(x) ; ++ ++ vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.; ++ vec3 sh = vec3(lessThan(h,D.xxx)); ++ ++ vec3 a0 = x + sx*sh; ++ vec2 p0 = vec2(a0.x,h.x); ++ vec2 p1 = vec2(a0.y,h.y); ++ vec2 p2 = vec2(a0.z,h.z); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++#endif ++ ++ vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) ); ++#else ++// N points around a unit circle. ++ vec3 phi = D.z * mod(p,pParam.w) /pParam.w ; ++ vec4 a0 = sin(phi.xxyy+D.xyxy); ++ vec2 a1 = sin(phi.zz +D.xy); ++ vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) ); ++#endif ++// mix ++ vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); ++ m = m*m ; ++ return 1.66666* 70.*dot(m*m, g); ++ } ++ ++float simplexNoise3(vec3 v) ++ { ++ const vec2 C = vec2(1./6. , 1./3. ) ; ++ const vec4 D = vec4(0., 0.5, 1.0, 2.0); ++ ++// First corner ++ vec3 i = floor(v + dot(v, C.yyy) ); ++ vec3 x0 = v - i + dot(i, C.xxx) ; ++ ++// Other corners ++#ifdef COLLAPSE_SORTNET ++ vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) ); ++ vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) ); ++ ++ vec3 i1 = g.xyz * l.zxy; ++ vec3 i2 = max( g.xyz, l.zxy); ++#else ++// Keeping this clean - let the compiler optimize. ++ vec3 q1; ++ q1.x = max(x0.x, x0.y); ++ q1.y = min(x0.x, x0.y); ++ q1.z = x0.z; ++ ++ vec3 q2; ++ q2.x = max(q1.x,q1.z); ++ q2.z = min(q1.x,q1.z); ++ q2.y = q1.y; ++ ++ vec3 q3; ++ q3.y = max(q2.y, q2.z); ++ q3.z = min(q2.y, q2.z); ++ q3.x = q2.x; ++ ++ vec3 i1 = vec3(equal(q3.xxx, x0)); ++ vec3 i2 = i1 + vec3(equal(q3.yyy, x0)); ++#endif ++ ++ // x0 = x0 - 0. + 0. * C ++ vec3 x1 = x0 - i1 + 1. * C.xxx; ++ vec3 x2 = x0 - i2 + 2. * C.xxx; ++ vec3 x3 = x0 - 1. + 3. * C.xxx; ++ ++// Permutations ++ i = mod(i, pParam.x ); ++ vec4 p = permute( permute( permute( ++ i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz) ++ + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz) ++ + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz); ++ ++// Gradients ++// ( N*N points uniformly over a square, mapped onto a octohedron.) ++ float n_ = 1.0/pParam.w ; ++ vec3 ns = n_ * D.wyz - D.xzx ; ++ ++ vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N) ++ ++ vec4 x_ = floor(j * ns.z) ; ++ vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N) ++ ++ vec4 x = x_ *ns.x + ns.yyyy; ++ vec4 y = y_ *ns.x + ns.yyyy; ++ vec4 h = 1. - abs(x) - abs(y); ++ ++ vec4 b0 = vec4( x.xy, y.xy ); ++ vec4 b1 = vec4( x.zw, y.zw ); ++ ++ vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.; ++ vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.; ++ vec4 sh = vec4(lessThan(h, D.xxxx)); ++ ++ vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ; ++ vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ; ++ ++ vec3 p0 = vec3(a0.xy,h.x); ++ vec3 p1 = vec3(a0.zw,h.y); ++ vec3 p2 = vec3(a1.xy,h.z); ++ vec3 p3 = vec3(a1.zw,h.w); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++ p3 *= taylorInvSqrt(dot(p3,p3)); ++#endif ++ ++// Mix ++ vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.); ++ m = m * m; ++//used to be 64. ++ return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), ++ dot(p2,x2), dot(p3,x3) ) ); ++ } ++ ++vec4 grad4(float j, vec4 ip) ++ { ++ const vec4 ones = vec4(1.,1.,1.,-1.); ++ vec4 p,s; ++ ++ p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0; ++ p.w = 1.5 - dot(abs(p.xyz), ones.xyz); ++ s = vec4(lessThan(p,vec4(0.))); ++ p.xyz = p.xyz + (s.xyz*2.-1.) * s.www; ++ ++ return p; ++ } ++ ++float simplexNoise4(vec4 v) ++ { ++ const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 ++ 0.309016994374947451); // (sqrt(5) - 1)/4 F4 ++// First corner ++ vec4 i = floor(v + dot(v, C.yyyy) ); ++ vec4 x0 = v - i + dot(i, C.xxxx); ++ ++// Other corners ++ ++// Force existance of strict total ordering in sort. ++ vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.); ++ vec4 q1; ++ q1.xy = max(q0.xy,q0.zw); // x:z y:w ++ q1.zw = min(q0.xy,q0.zw); ++ ++ vec4 q2; ++ q2.xz = max(q1.xz,q1.yw); // x:y z:w ++ q2.yw = min(q1.xz,q1.yw); ++ ++ vec4 q3; ++ q3.y = max(q2.y,q2.z); // y:z ++ q3.z = min(q2.y,q2.z); ++ q3.xw = q2.xw; ++ ++ vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0)); ++ vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0)); ++ vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0)); ++ ++ // x0 = x0 - 0. + 0. * C ++ vec4 x1 = x0 - i1 + 1. * C.xxxx; ++ vec4 x2 = x0 - i2 + 2. * C.xxxx; ++ vec4 x3 = x0 - i3 + 3. * C.xxxx; ++ vec4 x4 = x0 - 1. + 4. * C.xxxx; ++ ++// Permutations ++ i = mod(i, pParam.x ); ++ float j0 = permute( permute( permute( permute ( ++ i.w, pParam.xyz) + i.z, pParam.xyz) ++ + i.y, pParam.xyz) + i.x, pParam.xyz); ++ vec4 j1 = permute( permute( permute( permute ( ++ i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz) ++ + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz) ++ + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz) ++ + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz); ++// Gradients ++// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.) ++ vec4 ip = pParam ; ++ ip.xy *= pParam.w ; ++ ip.x *= pParam.w ; ++ ip = vec4(1.,1.,1.,2.) / ip ; ++ ++ vec4 p0 = grad4(j0, ip); ++ vec4 p1 = grad4(j1.x, ip); ++ vec4 p2 = grad4(j1.y, ip); ++ vec4 p3 = grad4(j1.z, ip); ++ vec4 p4 = grad4(j1.w, ip); ++ ++#ifdef NORMALISE_GRADIENTS ++ p0 *= taylorInvSqrt(dot(p0,p0)); ++ p1 *= taylorInvSqrt(dot(p1,p1)); ++ p2 *= taylorInvSqrt(dot(p2,p2)); ++ p3 *= taylorInvSqrt(dot(p3,p3)); ++ p4 *= taylorInvSqrt(dot(p4,p4)); ++#endif ++ ++// Mix ++ vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); ++ vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.); ++ m0 = m0 * m0; ++ m1 = m1 * m1; ++ return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) ++ + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; ++ ++ } ++ ++ ++ +diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert +new file mode 100644 +index 0000000..28970ee +--- /dev/null ++++ b/src/glsl/skinning.vert +@@ -0,0 +1,24 @@ ++// Vertex weighting/blendin shader ++// Brian Paul ++// 4 Nov 2008 ++ ++uniform mat4 mat0, mat1; ++attribute float weight; ++ ++void main() ++{ ++ // simple diffuse shading ++ // Note that we should really transform the normal vector along with ++ // the postion below... someday. ++ vec3 lightVec = vec3(0, 0, 1); ++ vec3 norm = gl_NormalMatrix * gl_Normal; ++ float dot = 0.2 + max(0.0, dot(norm, lightVec)); ++ gl_FrontColor = vec4(dot); ++ ++ // compute sum of weighted transformations ++ vec4 pos0 = mat0 * gl_Vertex; ++ vec4 pos1 = mat1 * gl_Vertex; ++ vec4 pos = mix(pos0, pos1, weight); ++ ++ gl_Position = gl_ModelViewProjectionMatrix * pos; ++} +diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag +new file mode 100644 +index 0000000..0839436 +--- /dev/null ++++ b/src/perf/glslstateschange1.frag +@@ -0,0 +1,19 @@ ++// Multi-texture fragment shader ++// Brian Paul ++ ++// Composite second texture over first. ++// We're assuming the 2nd texture has a meaningful alpha channel. ++ ++uniform sampler2D tex1; ++uniform sampler2D tex2; ++uniform vec4 UniV1; ++uniform vec4 UniV2; ++ ++void main() ++{ ++ vec4 t3; ++ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); ++ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); ++ t3 = mix(t1, t2, t2.w); ++ gl_FragColor = t3 + UniV1 + UniV2; ++} +diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert +new file mode 100644 +index 0000000..cef50db +--- /dev/null ++++ b/src/perf/glslstateschange1.vert +@@ -0,0 +1,14 @@ ++// Multi-texture vertex shader ++// Brian Paul ++ ++ ++attribute vec4 TexCoord0, TexCoord1; ++attribute vec4 VertCoord; ++ ++void main() ++{ ++ gl_TexCoord[0] = TexCoord0; ++ gl_TexCoord[1] = TexCoord1; ++ // note: may use gl_Vertex or VertCoord here for testing: ++ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; ++} +diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag +new file mode 100644 +index 0000000..0df0319 +--- /dev/null ++++ b/src/perf/glslstateschange2.frag +@@ -0,0 +1,17 @@ ++// Multi-texture fragment shader ++// Brian Paul ++ ++// Composite second texture over first. ++// We're assuming the 2nd texture has a meaningful alpha channel. ++ ++uniform sampler2D tex1; ++uniform sampler2D tex2; ++uniform vec4 UniV1; ++uniform vec4 UniV2; ++ ++void main() ++{ ++ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); ++ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); ++ gl_FragColor = t1 + t2 + UniV1 + UniV2; ++} +diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert +new file mode 100644 +index 0000000..cef50db +--- /dev/null ++++ b/src/perf/glslstateschange2.vert +@@ -0,0 +1,14 @@ ++// Multi-texture vertex shader ++// Brian Paul ++ ++ ++attribute vec4 TexCoord0, TexCoord1; ++attribute vec4 VertCoord; ++ ++void main() ++{ ++ gl_TexCoord[0] = TexCoord0; ++ gl_TexCoord[1] = TexCoord1; ++ // note: may use gl_Vertex or VertCoord here for testing: ++ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; ++} +diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl +new file mode 100644 +index 0000000..bc7ae4b +--- /dev/null ++++ b/src/vpglsl/infinite-loop.glsl +@@ -0,0 +1,8 @@ ++void main() { ++ gl_Position = gl_Vertex; ++ vec4 sum = vec4(0); ++ for (int i = 1; i != 2; i += 2) { ++ sum += vec4(0.1, 0.1, 0.1, 0.1); ++ } ++ gl_FrontColor = sum; ++} +-- +1.7.9.5 + diff --git a/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch new file mode 100644 index 00000000..c89f8789 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos/0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch @@ -0,0 +1,234 @@ +From bc7fa67d13e8032601df5cf04e15c53a7204dcd7 Mon Sep 17 00:00:00 2001 +From: Drew Moseley <drew_moseley@mentor.com> +Date: Fri, 9 May 2014 11:50:24 -0400 +Subject: [PATCH] mesa-demos: Use DEMOS_DATA_DIR to locate data files + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] +Signed-off-by: Drew Moseley <drew_moseley@mentor.com> +--- + src/glsl/bezier.c | 2 +- + src/glsl/blinking-teapot.c | 4 ++-- + src/glsl/brick.c | 4 ++-- + src/glsl/bump.c | 6 +++--- + src/glsl/convolutions.c | 2 +- + src/glsl/mandelbrot.c | 4 ++-- + src/glsl/multitex.c | 4 ++-- + src/glsl/simplex-noise.c | 2 +- + src/glsl/skinning.c | 4 ++-- + src/glsl/texdemo1.c | 8 ++++---- + src/glsl/toyball.c | 4 ++-- + src/objviewer/objview.c | 12 ++++++------ + src/perf/glslstateschange.c | 8 ++++---- + 13 files changed, 32 insertions(+), 32 deletions(-) + +diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c +index 0b56bc1..e01603d 100644 +--- a/src/glsl/bezier.c ++++ b/src/glsl/bezier.c +@@ -13,7 +13,7 @@ + #include "glut_wrap.h" + #include "shaderutil.h" + +-static const char *filename = "bezier.geom"; ++static const char *filename = DEMOS_DATA_DIR "bezier.geom"; + + static GLuint fragShader; + static GLuint vertShader; +diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c +index e3bf24d..7662b1f 100644 +--- a/src/glsl/blinking-teapot.c ++++ b/src/glsl/blinking-teapot.c +@@ -63,8 +63,8 @@ init_opengl (void) + exit(1); + } + +- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); +- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); ++ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); ++ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); + prog_id = LinkShaders (vshad_id, fshad_id); + + UseProgram (prog_id); +diff --git a/src/glsl/brick.c b/src/glsl/brick.c +index 3021856..fe5f190 100644 +--- a/src/glsl/brick.c ++++ b/src/glsl/brick.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH06-brick.frag"; +-static char *VertProgFile = "CH06-brick.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/bump.c b/src/glsl/bump.c +index 59f62cd..3a1b20a 100644 +--- a/src/glsl/bump.c ++++ b/src/glsl/bump.c +@@ -15,9 +15,9 @@ + #include "readtex.h" + + +-static char *FragProgFile = "CH11-bumpmap.frag"; +-static char *FragTexProgFile = "CH11-bumpmaptex.frag"; +-static char *VertProgFile = "CH11-bumpmap.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; ++static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; + static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; + + /* program/shader objects */ +diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c +index a120cfe..9312f00 100644 +--- a/src/glsl/convolutions.c ++++ b/src/glsl/convolutions.c +@@ -340,7 +340,7 @@ static void init(void) + + menuInit(); + readTexture(textureLocation); +- createProgram("convolution.vert", "convolution.frag"); ++ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); + + glEnable(GL_TEXTURE_2D); + glClearColor(1.0, 1.0, 1.0, 1.0); +diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c +index 31ede1d..ab34a0f 100644 +--- a/src/glsl/mandelbrot.c ++++ b/src/glsl/mandelbrot.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH18-mandel.frag"; +-static char *VertProgFile = "CH18-mandel.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c +index 262ea50..546bd27 100644 +--- a/src/glsl/multitex.c ++++ b/src/glsl/multitex.c +@@ -35,8 +35,8 @@ + + static const char *Demo = "multitex"; + +-static const char *VertFile = "multitex.vert"; +-static const char *FragFile = "multitex.frag"; ++static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; ++static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; + + static const char *TexFiles[2] = + { +diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c +index 13fdd5d..885f01e 100644 +--- a/src/glsl/simplex-noise.c ++++ b/src/glsl/simplex-noise.c +@@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) + static void + Init(void) + { +- const char *filename = "simplex-noise.glsl"; ++ const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; + char noiseText[10000]; + FILE *f; + int len; +diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c +index bf38d77..536d475 100644 +--- a/src/glsl/skinning.c ++++ b/src/glsl/skinning.c +@@ -20,8 +20,8 @@ + #define M_PI 3.1415926535 + #endif + +-static char *FragProgFile = "skinning.frag"; +-static char *VertProgFile = "skinning.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c +index 6cde239..a082342 100644 +--- a/src/glsl/texdemo1.c ++++ b/src/glsl/texdemo1.c +@@ -35,11 +35,11 @@ + + static const char *Demo = "texdemo1"; + +-static const char *ReflectVertFile = "reflect.vert"; +-static const char *CubeFragFile = "cubemap.frag"; ++static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; ++static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; + +-static const char *SimpleVertFile = "simple.vert"; +-static const char *SimpleTexFragFile = "shadowtex.frag"; ++static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; ++static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; + + static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; + +diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c +index 5f27951..4e7e832 100644 +--- a/src/glsl/toyball.c ++++ b/src/glsl/toyball.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH11-toyball.frag"; +-static char *VertProgFile = "CH11-toyball.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/objviewer/objview.c b/src/objviewer/objview.c +index 6def726..78a6acf 100644 +--- a/src/objviewer/objview.c ++++ b/src/objviewer/objview.c +@@ -162,12 +162,12 @@ init_model(void) + static void + init_skybox(void) + { +- SkyboxTex = LoadSkyBoxCubeTexture("alpine_east.rgb", +- "alpine_west.rgb", +- "alpine_up.rgb", +- "alpine_down.rgb", +- "alpine_south.rgb", +- "alpine_north.rgb"); ++ SkyboxTex = LoadSkyBoxCubeTexture(DEMOS_DATA_DIR "alpine_east.rgb", ++ DEMOS_DATA_DIR "alpine_west.rgb", ++ DEMOS_DATA_DIR "alpine_up.rgb", ++ DEMOS_DATA_DIR "alpine_down.rgb", ++ DEMOS_DATA_DIR "alpine_south.rgb", ++ DEMOS_DATA_DIR "alpine_north.rgb"); + glmSpecularTexture(Model, SkyboxTex); + } + +diff --git a/src/perf/glslstateschange.c b/src/perf/glslstateschange.c +index 7422b78..dbf8332 100644 +--- a/src/perf/glslstateschange.c ++++ b/src/perf/glslstateschange.c +@@ -33,10 +33,10 @@ + #include "glmain.h" + #include "common.h" + +-static const char *VertFile1 = "glslstateschange1.vert"; +-static const char *FragFile1 = "glslstateschange1.frag"; +-static const char *VertFile2 = "glslstateschange2.vert"; +-static const char *FragFile2 = "glslstateschange2.frag"; ++static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; ++static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; ++static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; ++static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; + static struct uniform_info Uniforms1[] = { + { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, + { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, +-- +1.7.9.5 + diff --git a/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos_8.1.0.bbappend b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos_8.1.0.bbappend new file mode 100644 index 00000000..b7e42908 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa-demos/mesa-demos_8.1.0.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +EXTRA_OECONF += "--with-system-data-files" +PACKAGECONFIG[glut] = "--with-glut=${STAGING_EXECPREFIXDIR},--without-glut," +DEPENDS_steppeeagle += "mesa-glut glew" +PACKAGECONFIG_append_steppeeagle = " glut" + +SRC_URI += " \ + file://0001-mesa-demos-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ + file://0001-mesa-demos-Add-missing-data-files.patch \ +" + +do_install_append () { + install -m 0644 ${S}/src/perf/*.frag \ + ${S}/src/perf/*.vert \ + ${S}/src/glsl/*.frag \ + ${S}/src/glsl/*.vert \ + ${S}/src/glsl/*.geom \ + ${S}/src/glsl/*.glsl ${D}${datadir}/${BPN} +} diff --git a/meta-steppeeagle/recipes-graphics/mesa/mesa/0001-radeonsi-add-support-for-Mullins-asics.patch b/meta-steppeeagle/recipes-graphics/mesa/mesa/0001-radeonsi-add-support-for-Mullins-asics.patch new file mode 100644 index 00000000..51b1d070 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa/mesa/0001-radeonsi-add-support-for-Mullins-asics.patch @@ -0,0 +1,74 @@ +From 5dfd2c48a8d4b362a6119a2dcbfe66e163e3af35 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Thu, 17 Apr 2014 15:49:52 -0400 +Subject: [PATCH 1/2] radeonsi: add support for Mullins asics. + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++ + src/gallium/drivers/radeonsi/si_state.c | 2 ++ + src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 + + src/gallium/winsys/radeon/drm/radeon_winsys.h | 1 + + 4 files changed, 6 insertions(+) + +diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c +index 7508865..db6709a 100644 +--- a/src/gallium/drivers/radeon/r600_pipe_common.c ++++ b/src/gallium/drivers/radeon/r600_pipe_common.c +@@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* pscreen) + case CHIP_KAVERI: return "AMD KAVERI"; + case CHIP_KABINI: return "AMD KABINI"; + case CHIP_HAWAII: return "AMD HAWAII"; ++ case CHIP_MULLINS: return "AMD MULLINS"; + default: return "AMD unknown"; + } + } +@@ -410,6 +411,7 @@ const char *r600_get_llvm_processor_name(enum radeon_family family) + case CHIP_KABINI: return "kabini"; + case CHIP_KAVERI: return "kaveri"; + case CHIP_HAWAII: return "hawaii"; ++ case CHIP_MULLINS: return "mullins"; + default: return ""; + #endif + } +diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c +index ab9c4cc..85ef5ae 100644 +--- a/src/gallium/drivers/radeonsi/si_state.c ++++ b/src/gallium/drivers/radeonsi/si_state.c +@@ -3086,6 +3086,8 @@ void si_init_config(struct si_context *sctx) + /* XXX todo */ + case CHIP_KABINI: + /* XXX todo */ ++ case CHIP_MULLINS: ++ /* XXX todo */ + default: + si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000); + si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000); +diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +index 0eb0c6a..602c406 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c ++++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +@@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws) + case CHIP_KAVERI: + case CHIP_KABINI: + case CHIP_HAWAII: ++ case CHIP_MULLINS: + ws->info.chip_class = CIK; + break; + } +diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h +index fe0617b..1c0c825 100644 +--- a/src/gallium/winsys/radeon/drm/radeon_winsys.h ++++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h +@@ -130,6 +130,7 @@ enum radeon_family { + CHIP_KAVERI, + CHIP_KABINI, + CHIP_HAWAII, ++ CHIP_MULLINS, + CHIP_LAST, + }; + +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/mesa/mesa/0002-radeonsi-add-Mullins-pci-ids.patch b/meta-steppeeagle/recipes-graphics/mesa/mesa/0002-radeonsi-add-Mullins-pci-ids.patch new file mode 100644 index 00000000..264fd958 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa/mesa/0002-radeonsi-add-Mullins-pci-ids.patch @@ -0,0 +1,42 @@ +From 5b54f9dac924f9b469105bc664f6bf2b3234f691 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Tue, 12 Nov 2013 15:49:55 -0500 +Subject: [PATCH 2/2] radeonsi: add Mullins pci ids. + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + include/pci_ids/radeonsi_pci_ids.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/include/pci_ids/radeonsi_pci_ids.h b/include/pci_ids/radeonsi_pci_ids.h +index 7b42d5e..5099c74 100644 +--- a/include/pci_ids/radeonsi_pci_ids.h ++++ b/include/pci_ids/radeonsi_pci_ids.h +@@ -97,6 +97,23 @@ CHIPSET(0x983D, KABINI_983D, KABINI) + CHIPSET(0x983E, KABINI_983E, KABINI) + CHIPSET(0x983F, KABINI_983F, KABINI) + ++CHIPSET(0x9850, MULLINS_9850, MULLINS) ++CHIPSET(0x9851, MULLINS_9851, MULLINS) ++CHIPSET(0x9852, MULLINS_9852, MULLINS) ++CHIPSET(0x9853, MULLINS_9853, MULLINS) ++CHIPSET(0x9854, MULLINS_9854, MULLINS) ++CHIPSET(0x9855, MULLINS_9855, MULLINS) ++CHIPSET(0x9856, MULLINS_9856, MULLINS) ++CHIPSET(0x9857, MULLINS_9857, MULLINS) ++CHIPSET(0x9858, MULLINS_9858, MULLINS) ++CHIPSET(0x9859, MULLINS_9859, MULLINS) ++CHIPSET(0x985A, MULLINS_985A, MULLINS) ++CHIPSET(0x985B, MULLINS_985B, MULLINS) ++CHIPSET(0x985C, MULLINS_985C, MULLINS) ++CHIPSET(0x985D, MULLINS_985D, MULLINS) ++CHIPSET(0x985E, MULLINS_985E, MULLINS) ++CHIPSET(0x985F, MULLINS_985F, MULLINS) ++ + CHIPSET(0x1304, KAVERI_1304, KAVERI) + CHIPSET(0x1305, KAVERI_1305, KAVERI) + CHIPSET(0x1306, KAVERI_1306, KAVERI) +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/mesa/mesa_git.bbappend b/meta-steppeeagle/recipes-graphics/mesa/mesa_git.bbappend new file mode 100644 index 00000000..7f85de14 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/mesa/mesa_git.bbappend @@ -0,0 +1,60 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRCREV = "d4e5ea65089af05b5891293d8947b0ee0e9dd429" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" +PV = "10.2.0+git${SRCPV}" +DEPENDS += "libvdpau" +PACKAGECONFIG_append = " xvmc openvg gallium gallium-egl gallium-gbm r600" +PACKAGECONFIG_append += " gallium-llvm" +MESA_LLVM_RELEASE = "3.4" + +# Install the demos onto the target +RRECOMMENDS_libgl-mesa += "mesa-demos" + +SRC_URI = " \ + git://people.freedesktop.org/~deathsimple/mesa;branch=vce-release \ + file://0001-radeonsi-add-support-for-Mullins-asics.patch \ + file://0002-radeonsi-add-Mullins-pci-ids.patch \ + " + +PATCHTOOL = "git" + +DEPENDS += "libomxil" +EXTRA_OECONF += "--disable-dri3 \ + --enable-vdpau \ + --enable-osmesa \ + --enable-xa \ + --enable-glx \ + --enable-omx \ + --with-omx-libdir=${libdir}/bellagio \ + " + +PACKAGES += "libxvmcr600-${PN}-dev" +FILES_libxvmcr600-${PN}-dev += "${libdir}/libXvMCr600.so \ + ${libdir}/libXvMCr600.la" + +PACKAGES += "libxvmcnouveau-${PN}-dev" +FILES_libxvmcnouveau-${PN}-dev += "${libdir}/libXvMCnouveau.so \ + ${libdir}/libXvMCnouveau.la" + +PACKAGES += "libvdpau-${PN} libvdpau-${PN}-dev" +FILES_libvdpau-${PN} += "${libdir}/vdpau/libvdpau*.so.*" +FILES_libvdpau-${PN}-dev += "${libdir}/vdpau/libvdpau*.so \ + ${libdir}/vdpau/libvdpau*.la" +FILES_${PN}-dbg += "${libdir}/vdpau/.debug" + +PACKAGES += "libxatracker-${PN} libxatracker-${PN}-dev" +FILES_libxatracker-${PN} += "${libdir}/libxatracker.so.*" +FILES_libxatracker-${PN}-dev += "${includedir}/xa_tracker.h \ + ${includedir}/xa_composite.h \ + ${includedir}/xa_context.h \ + ${libdir}/pkgconfig/xatracker.pc \ + ${libdir}/libxatracker.so \ + ${libdir}/libxatracker.la \ + " + +PACKAGES += "libomx-${PN} libomx-${PN}-dev libomx-${PN}-dbg" +FILES_libomx-${PN} += "${libdir}/bellagio/libomx_*.so.*" +FILES_libomx-${PN}-dev += "${libdir}/bellagio/libomx_*.so \ + ${libdir}/bellagio/libomx_*.la" +FILES_libomx-${PN}-dbg += "${libdir}/bellagio/.debug" diff --git a/meta-steppeeagle/recipes-graphics/vdpauinfo/vdpauinfo_0.1.bb b/meta-steppeeagle/recipes-graphics/vdpauinfo/vdpauinfo_0.1.bb new file mode 100644 index 00000000..aa726b2b --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/vdpauinfo/vdpauinfo_0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "VDPAU info tool" +HOMEPAGE = "http://people.freedesktop.org" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c" + +SRC_URI = "http://cgit.freedesktop.org/~aplattner/vdpauinfo/snapshot/vdpauinfo-${PV}.zip" +SRC_URI[md5sum] = "62902c9d5d4417885aa70d05521b8280" +SRC_URI[sha256sum] = "b87dd48b2b3b4fc7e886c6963d8dfe8d4dffa3f7b91768a1376ba3e295c28db7" + +inherit autotools pkgconfig + +DEPENDS += "virtual/libx11 libvdpau" + +RDEPENDS_${PN} += "libvdpau-mesa" diff --git a/meta-steppeeagle/recipes-graphics/xorg-driver/glamor-egl_0.6.0.bb b/meta-steppeeagle/recipes-graphics/xorg-driver/glamor-egl_0.6.0.bb new file mode 100644 index 00000000..2628adbe --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-driver/glamor-egl_0.6.0.bb @@ -0,0 +1,18 @@ +require recipes-graphics/xorg-driver/xorg-driver-common.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=c7f5e33031114ad132cb03949d73a8a8" + +SRC_URI[md5sum] = "b3668594675f71a75153ee52dbd35535" +SRC_URI[sha256sum] = "66531b56e6054eb53daa7bd57eb6358a7ead1b84f63419606e69d1092365e5c9" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--prefix=${prefix} \ + --sysconfdir=${sysconfdir} \ + --localstatedir=${localstatedir} \ + --enable-glx-tls" + +FILES_${PN} += "${datadir}/X11/xorg.conf.d ${libdir}/xorg/modules/lib*.so" +FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug" diff --git a/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0001-radeon-add-support-for-Mullins.patch b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0001-radeon-add-support-for-Mullins.patch new file mode 100644 index 00000000..29c1c714 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0001-radeon-add-support-for-Mullins.patch @@ -0,0 +1,41 @@ +From 5cf5f62f912c3cd178561ad164f1f51f980e96a9 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Thu, 17 Apr 2014 15:17:28 -0400 +Subject: [PATCH 1/2] radeon: add support for Mullins. + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + man/radeon.man | 3 +++ + src/radeon_probe.h | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/man/radeon.man b/man/radeon.man +index f6a825d..65b880c 100644 +--- a/man/radeon.man ++++ b/man/radeon.man +@@ -208,6 +208,9 @@ KABINI APUs + .TP 12 + .B HAWAII + Radeon R9 series ++.TP 12 ++.B MULLINS ++MULLINS APUs + .PD + .SH CONFIGURATION DETAILS + Please refer to __xconfigfile__(__filemansuffix__) for general configuration +diff --git a/src/radeon_probe.h b/src/radeon_probe.h +index 9500189..3fe4644 100644 +--- a/src/radeon_probe.h ++++ b/src/radeon_probe.h +@@ -116,6 +116,7 @@ typedef enum { + CHIP_FAMILY_KAVERI, + CHIP_FAMILY_KABINI, + CHIP_FAMILY_HAWAII, ++ CHIP_FAMILY_MULLINS, + CHIP_FAMILY_LAST + } RADEONChipFamily; + +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0002-radeon-kms-add-Mullins-pci-ids.patch b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0002-radeon-kms-add-Mullins-pci-ids.patch new file mode 100644 index 00000000..d3cd5502 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati/0002-radeon-kms-add-Mullins-pci-ids.patch @@ -0,0 +1,181 @@ +From e1484dfd7336aa71ad020968615b1acc0d34fb89 Mon Sep 17 00:00:00 2001 +From: Samuel Li <samuel.li@amd.com> +Date: Tue, 12 Nov 2013 15:30:42 -0500 +Subject: [PATCH 2/2] radeon/kms: add Mullins pci ids. + +Signed-off-by: Samuel Li <samuel.li@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + src/ati_pciids_gen.h | 16 ++++++++++++++++ + src/pcidb/ati_pciids.csv | 16 ++++++++++++++++ + src/radeon_chipinfo_gen.h | 16 ++++++++++++++++ + src/radeon_chipset_gen.h | 16 ++++++++++++++++ + src/radeon_pci_chipset_gen.h | 16 ++++++++++++++++ + src/radeon_pci_device_match_gen.h | 16 ++++++++++++++++ + 6 files changed, 96 insertions(+) + +diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h +index eb57992..94c8fc8 100644 +--- a/src/ati_pciids_gen.h ++++ b/src/ati_pciids_gen.h +@@ -722,6 +722,22 @@ + #define PCI_CHIP_KABINI_983D 0x983D + #define PCI_CHIP_KABINI_983E 0x983E + #define PCI_CHIP_KABINI_983F 0x983F ++#define PCI_CHIP_MULLINS_9850 0x9850 ++#define PCI_CHIP_MULLINS_9851 0x9851 ++#define PCI_CHIP_MULLINS_9852 0x9852 ++#define PCI_CHIP_MULLINS_9853 0x9853 ++#define PCI_CHIP_MULLINS_9854 0x9854 ++#define PCI_CHIP_MULLINS_9855 0x9855 ++#define PCI_CHIP_MULLINS_9856 0x9856 ++#define PCI_CHIP_MULLINS_9857 0x9857 ++#define PCI_CHIP_MULLINS_9858 0x9858 ++#define PCI_CHIP_MULLINS_9859 0x9859 ++#define PCI_CHIP_MULLINS_985A 0x985A ++#define PCI_CHIP_MULLINS_985B 0x985B ++#define PCI_CHIP_MULLINS_985C 0x985C ++#define PCI_CHIP_MULLINS_985D 0x985D ++#define PCI_CHIP_MULLINS_985E 0x985E ++#define PCI_CHIP_MULLINS_985F 0x985F + #define PCI_CHIP_KAVERI_1304 0x1304 + #define PCI_CHIP_KAVERI_1305 0x1305 + #define PCI_CHIP_KAVERI_1306 0x1306 +diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv +index 8469a2a..e334230 100644 +--- a/src/pcidb/ati_pciids.csv ++++ b/src/pcidb/ati_pciids.csv +@@ -723,6 +723,22 @@ + "0x983D","KABINI_983D","KABINI",,1,,,1,"KABINI" + "0x983E","KABINI_983E","KABINI",,1,,,1,"KABINI" + "0x983F","KABINI_983F","KABINI",,1,,,1,"KABINI" ++"0x9850","MULLINS_9850","MULLINS",1,1,,,1,"MULLINS" ++"0x9851","MULLINS_9851","MULLINS",1,1,,,1,"MULLINS" ++"0x9852","MULLINS_9852","MULLINS",1,1,,,1,"MULLINS" ++"0x9853","MULLINS_9853","MULLINS",1,1,,,1,"MULLINS" ++"0x9854","MULLINS_9854","MULLINS",1,1,,,1,"MULLINS" ++"0x9845","MULLINS_9855","MULLINS",1,1,,,1,"MULLINS" ++"0x9856","MULLINS_9856","MULLINS",1,1,,,1,"MULLINS" ++"0x9857","MULLINS_9857","MULLINS",1,1,,,1,"MULLINS" ++"0x9858","MULLINS_9858","MULLINS",1,1,,,1,"MULLINS" ++"0x9859","MULLINS_9859","MULLINS",1,1,,,1,"MULLINS" ++"0x985A","MULLINS_985A","MULLINS",1,1,,,1,"MULLINS" ++"0x985B","MULLINS_985B","MULLINS",1,1,,,1,"MULLINS" ++"0x985C","MULLINS_985C","MULLINS",1,1,,,1,"MULLINS" ++"0x985D","MULLINS_985D","MULLINS",1,1,,,1,"MULLINS" ++"0x985E","MULLINS_985E","MULLINS",1,1,,,1,"MULLINS" ++"0x985F","MULLINS_985F","MULLINS",1,1,,,1,"MULLINS" + "0x1304","KAVERI_1304","KAVERI",1,1,,,1,"KAVERI" + "0x1305","KAVERI_1305","KAVERI",,1,,,1,"KAVERI" + "0x1306","KAVERI_1306","KAVERI",1,1,,,1,"KAVERI" +diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h +index fc9474b..4f6e3bc 100644 +--- a/src/radeon_chipinfo_gen.h ++++ b/src/radeon_chipinfo_gen.h +@@ -642,6 +642,22 @@ static RADEONCardInfo RADEONCards[] = { + { 0x983D, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 }, + { 0x983E, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 }, + { 0x983F, CHIP_FAMILY_KABINI, 0, 1, 0, 0, 1 }, ++ { 0x9850, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9851, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9852, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9853, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9854, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9855, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9856, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9857, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9858, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x9859, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985A, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985B, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985C, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985D, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985E, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, ++ { 0x985F, CHIP_FAMILY_MULLINS, 1, 1, 0, 0, 1 }, + { 0x1304, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 }, + { 0x1305, CHIP_FAMILY_KAVERI, 0, 1, 0, 0, 1 }, + { 0x1306, CHIP_FAMILY_KAVERI, 1, 1, 0, 0, 1 }, +diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h +index afab6b0..03a413e 100644 +--- a/src/radeon_chipset_gen.h ++++ b/src/radeon_chipset_gen.h +@@ -642,6 +642,22 @@ SymTabRec RADEONChipsets[] = { + { PCI_CHIP_KABINI_983D, "KABINI" }, + { PCI_CHIP_KABINI_983E, "KABINI" }, + { PCI_CHIP_KABINI_983F, "KABINI" }, ++ { PCI_CHIP_MULLINS_9850, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9851, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9852, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9853, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9854, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9855, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9856, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9857, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9858, "MULLINS" }, ++ { PCI_CHIP_MULLINS_9859, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985A, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985B, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985C, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985D, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985E, "MULLINS" }, ++ { PCI_CHIP_MULLINS_985F, "MULLINS" }, + { PCI_CHIP_KAVERI_1304, "KAVERI" }, + { PCI_CHIP_KAVERI_1305, "KAVERI" }, + { PCI_CHIP_KAVERI_1306, "KAVERI" }, +diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h +index da4440b..a9b186c 100644 +--- a/src/radeon_pci_chipset_gen.h ++++ b/src/radeon_pci_chipset_gen.h +@@ -642,6 +642,22 @@ static PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_KABINI_983D, PCI_CHIP_KABINI_983D, RES_SHARED_VGA }, + { PCI_CHIP_KABINI_983E, PCI_CHIP_KABINI_983E, RES_SHARED_VGA }, + { PCI_CHIP_KABINI_983F, PCI_CHIP_KABINI_983F, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9850, PCI_CHIP_MULLINS_9850, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9851, PCI_CHIP_MULLINS_9851, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9852, PCI_CHIP_MULLINS_9852, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9853, PCI_CHIP_MULLINS_9853, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9854, PCI_CHIP_MULLINS_9854, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9855, PCI_CHIP_MULLINS_9855, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9856, PCI_CHIP_MULLINS_9856, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9857, PCI_CHIP_MULLINS_9857, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9858, PCI_CHIP_MULLINS_9858, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_9859, PCI_CHIP_MULLINS_9859, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985A, PCI_CHIP_MULLINS_985A, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985B, PCI_CHIP_MULLINS_985B, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985C, PCI_CHIP_MULLINS_985C, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985D, PCI_CHIP_MULLINS_985D, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985E, PCI_CHIP_MULLINS_985E, RES_SHARED_VGA }, ++ { PCI_CHIP_MULLINS_985F, PCI_CHIP_MULLINS_985F, RES_SHARED_VGA }, + { PCI_CHIP_KAVERI_1304, PCI_CHIP_KAVERI_1304, RES_SHARED_VGA }, + { PCI_CHIP_KAVERI_1305, PCI_CHIP_KAVERI_1305, RES_SHARED_VGA }, + { PCI_CHIP_KAVERI_1306, PCI_CHIP_KAVERI_1306, RES_SHARED_VGA }, +diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h +index d4b3763..a73d9c1 100644 +--- a/src/radeon_pci_device_match_gen.h ++++ b/src/radeon_pci_device_match_gen.h +@@ -642,6 +642,22 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983D, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983E, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_KABINI_983F, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9850, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9851, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9852, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9853, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9854, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9855, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9856, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9857, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9858, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_9859, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985A, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985B, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985C, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985D, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985E, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_MULLINS_985F, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1304, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1305, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_KAVERI_1306, 0 ), +-- +1.8.3.1 + diff --git a/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati_git.bb b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati_git.bb new file mode 100644 index 00000000..70676d0b --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-driver/xf86-video-ati_git.bb @@ -0,0 +1,38 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +SUMMARY = "X.Org X server -- ATI integrated graphics chipsets driver" + +DESCRIPTION = "xf86-video-ati is an Xorg driver for Intel integrated \ +graphics chipsets. The driver supports depths 8, 15, 16 and 24. On \ +some chipsets, the driver supports hardware accelerated 3D via the \ +Direct Rendering Infrastructure (DRI)." + +LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc" + +DEPENDS += "virtual/libx11 drm dri2proto glproto \ + virtual/libgl xineramaproto libpciaccess \ + udev glamor-egl" + +SRCREV = "48d3dbc8a0d3bfde88f46e402e530438f9317715" +PV = "7.3.99+git${SRCPV}" +PR = "${INC_PR}.1" + +EXTRA_OECONF += "--enable-udev --enable-glamor" + +SRC_URI = " \ + git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati \ + file://0001-radeon-add-support-for-Mullins.patch \ + file://0002-radeon-kms-add-Mullins-pci-ids.patch \ + " + +PATCHTOOL = "git" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} += "libgbm-gallium \ + mesa-driver-radeon \ + mesa-driver-radeonsi \ + mesa-driver-swrast \ + " + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' diff --git a/meta-steppeeagle/recipes-graphics/xorg-lib/libvdpau_0.7.bb b/meta-steppeeagle/recipes-graphics/xorg-lib/libvdpau_0.7.bb new file mode 100644 index 00000000..f6b9afe2 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-lib/libvdpau_0.7.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Implements VDPAU library" +HOMEPAGE = "http://people.freedesktop.org" +LICENSE = "MIT" +DEPENDS = "xtrans libx11 libxext libice libsm libxscrnsaver libxt \ + libxmu libxpm libxau libxfixes libxcomposite libxrender \ + libxcursor libxdamage libfontenc libxfont libxft libxi \ + libxinerama libxrandr libxres libxtst libxv libxvmc \ + libxxf86dga libxxf86vm libdmx libpciaccess libxkbfile \ + dri2proto \ + " +LIC_FILES_CHKSUM = "file://COPYING;md5=83af8811a28727a13f04132cc33b7f58" + +SRC_URI = "http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${PV}.tar.gz" +SRC_URI[md5sum] = "cb81b0c3b7d32b2b2a51894ef05b95ce" +SRC_URI[sha256sum] = "24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0" + +inherit autotools pkgconfig + +S = "${WORKDIR}/libvdpau-${PV}" + +FILES_${PN} += "${libdir}/vdpau/libvdpau_nouveau.so.* \ + ${libdir}/vdpau/libvdpau_r600.so.* \ + ${libdir}/vdpau/libvdpau_radeonsi.so.* \ + ${libdir}/vdpau/libvdpau_trace.so.* \ + " + +FILES_${PN}-dev += "${libdir}/vdpau/libvdpau_nouveau.so \ + ${libdir}/vdpau/libvdpau_nouveau.la \ + ${libdir}/vdpau/libvdpau_r600.so \ + ${libdir}/vdpau/libvdpau_r600.la \ + ${libdir}/vdpau/libvdpau_radeonsi.so \ + ${libdir}/vdpau/libvdpau_radeonsi.la \ + ${libdir}/vdpau/libvdpau_trace.so \ + ${libdir}/vdpau/libvdpau_trace.la \ + " + +FILES_${PN}-dbg += "${libdir}/vdpau/.debug" + +EXTRA_OECONF += "--enable-dri2" diff --git a/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config/steppeeagle/xorg.conf b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config/steppeeagle/xorg.conf new file mode 100644 index 00000000..17363bc6 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config/steppeeagle/xorg.conf @@ -0,0 +1,113 @@ +# TODO: imported from /usr/local/xorg/share/X11/conf.d/glamor.conf +Section "Module" + Load "dri2" + Load "glamoregl" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "Monitor Model" +EndSection + +Section "Device" + ### Available Driver options are:- + ### Values: <i>: integer, <f>: float, <bool>: "True"/"False", + ### <string>: "String", <freq>: "<f> Hz/kHz/MHz", + ### <percent>: "<f>%" + ### [arg]: arg optional + #Option "NoAccel" # [<bool>] + #Option "SWcursor" # [<bool>] + #Option "Dac6Bit" # [<bool>] + #Option "Dac8Bit" # [<bool>] + #Option "BusType" # [<str>] + #Option "CPPIOMode" # [<bool>] + #Option "CPusecTimeout" # <i> + #Option "AGPMode" # <i> + #Option "AGPFastWrite" # [<bool>] + #Option "AGPSize" # <i> + #Option "GARTSize" # <i> + #Option "RingSize" # <i> + #Option "BufferSize" # <i> + #Option "EnableDepthMoves" # [<bool>] + #Option "EnablePageFlip" # [<bool>] + #Option "NoBackBuffer" # [<bool>] + #Option "DMAForXv" # [<bool>] + #Option "FBTexPercent" # <i> + #Option "DepthBits" # <i> + #Option "PCIAPERSize" # <i> + #Option "AccelDFS" # [<bool>] + #Option "IgnoreEDID" # [<bool>] + #Option "CustomEDID" # [<str>] + #Option "DisplayPriority" # [<str>] + #Option "PanelSize" # [<str>] + #Option "ForceMinDotClock" # <freq> + #Option "ColorTiling" # [<bool>] + #Option "VideoKey" # <i> + #Option "RageTheatreCrystal" # <i> + #Option "RageTheatreTunerPort" # <i> + #Option "RageTheatreCompositePort" # <i> + #Option "RageTheatreSVideoPort" # <i> + #Option "TunerType" # <i> + #Option "RageTheatreMicrocPath" # <str> + #Option "RageTheatreMicrocType" # <str> + #Option "ScalerWidth" # <i> + #Option "RenderAccel" # [<bool>] + #Option "SubPixelOrder" # [<str>] + #Option "ClockGating" # [<bool>] + #Option "VGAAccess" # [<bool>] + #Option "ReverseDDC" # [<bool>] + #Option "LVDSProbePLL" # [<bool>] + Option "AccelMethod" "glamor" + #Option "DRI" # [<bool>] + #Option "ConnectorTable" # <str> + #Option "DefaultConnectorTable" # [<bool>] + #Option "DefaultTMDSPLL" # [<bool>] + #Option "TVDACLoadDetect" # [<bool>] + #Option "ForceTVOut" # [<bool>] + #Option "TVStandard" # <str> + #Option "IgnoreLidStatus" # [<bool>] + #Option "DefaultTVDACAdj" # [<bool>] + #Option "Int10" # [<bool>] + #Option "EXAVSync" # [<bool>] + #Option "ATOMTVOut" # [<bool>] + #Option "R4xxATOM" # [<bool>] + #Option "ForceLowPowerMode" # [<bool>] + #Option "DynamicPM" # [<bool>] + #Option "NewPLL" # [<bool>] + #Option "ZaphodHeads" # <str> + Identifier "Card0" + Driver "radeon" + BusID "PCI:0:1:0" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Card0" + Monitor "Monitor0" + SubSection "Display" + Viewport 0 0 + Depth 1 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 4 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 8 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 15 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 16 + EndSubSection + SubSection "Display" + Viewport 0 0 + Depth 24 + EndSubSection +EndSection + diff --git a/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend new file mode 100644 index 00000000..72d991c7 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bbappend b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bbappend new file mode 100644 index 00000000..aa1ecd66 --- /dev/null +++ b/meta-steppeeagle/recipes-graphics/xorg-xserver/xserver-xorg_1.15.0.bbappend @@ -0,0 +1,5 @@ +PR = "${INC_PR}.1" +EXTRA_OECONF += "--enable-aiglx \ + --enable-xvmc \ + --enable-libdrm \ + " |