From 1e5f8c2aeea6c58d1d3a9a41e10555962bb02138 Mon Sep 17 00:00:00 2001
From: timoore <timoore>
Date: Tue, 17 Nov 2009 06:23:12 +0000
Subject: [PATCH] Provide some reasonable default textures

Author: Tim Moore <timoore@redhat.com>
---
 Effects/chrome.eff        | 22 +++++++++++++---------
 Effects/model-default.eff |  9 +++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/Effects/chrome.eff b/Effects/chrome.eff
index 49384ef7e..eaa61e762 100644
--- a/Effects/chrome.eff
+++ b/Effects/chrome.eff
@@ -2,6 +2,9 @@
 <PropertyList>
   <name>Effects/chrome</name>
   <parameters>
+    <texture n ="0">
+      <type>transparent</type>
+    </texture>
     <chrome-light><use>/rendering/scene/chrome-light</use></chrome-light>
   </parameters>
   <technique n="11">
@@ -17,15 +20,16 @@
       <rendering-hint><use>rendering-hint</use></rendering-hint>
       <texture-unit>
         <unit>0</unit>
-          <image><use>texture[0]/image</use></image>
-          <filter><use>texture[0]/filter</use></filter>
-          <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
-          <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
-          <!--
-          <internal-format>
-            <use>texture[0]/internal-format</use>
-          </internal-format>
-          -->
+        <type><use>texture[0]/type</use></type>
+        <image><use>texture[0]/image</use></image>
+        <filter><use>texture[0]/filter</use></filter>
+        <wrap-s><use>texture[0]/wrap-s</use></wrap-s>
+        <wrap-t><use>texture[0]/wrap-t</use></wrap-t>
+        <!--
+           <internal-format>
+             <use>texture[0]/internal-format</use>
+           </internal-format>
+           -->
         <texenv-combine>
           <combine-rgb>modulate</combine-rgb>
           <source0-rgb>constant</source0-rgb>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 31946123c..e4951bb91 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PropertyList>
   <name>Effects/model-default</name>
+  <parameters>
+    <texture n ="0">
+      <type>white</type>
+    </texture>
+  </parameters>
   <technique n="10">
     <predicate>
       <and>
@@ -39,7 +44,11 @@
       <cull-face><use>cull-face</use></cull-face>
       <rendering-hint><use>rendering-hint</use></rendering-hint>
       <texture-unit>
+        <!-- The texture unit is always active because the shaders expect
+             that. -->
         <unit>0</unit>
+        <!-- If there is a texture, the type in the derived effect
+        will be "2d". -->
         <type><use>texture[0]/type</use></type>
         <image><use>texture[0]/image</use></image>
         <filter><use>texture[0]/filter</use></filter>