Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
121 additions
and
57 deletions.
There are no files selected for viewing
23 changes: 21 additions & 2 deletions
23
MonoGame.Framework/Graphics/Effect/EffectParameterClass.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,53 @@ | ||
using System; | ||
// MonoGame - Copyright (C) The MonoGame Team | ||
// This file is subject to the terms and conditions defined in | ||
// file 'LICENSE.txt', which is part of this source code package. | ||
|
||
namespace Microsoft.Xna.Framework.Graphics | ||
{ | ||
// http://msdn.microsoft.com/en-us/library/microsoft.xna.framework.graphics.effectparametertype.aspx | ||
/// <summary> | ||
/// Defines types for effect parameters and shader constants. | ||
/// </summary> | ||
public enum EffectParameterType | ||
{ | ||
/// <summary> | ||
/// Pointer to void type. | ||
/// </summary> | ||
Void, | ||
/// <summary> | ||
/// Boolean type. Any non-zero will be <c>true</c>; <c>false</c> otherwise. | ||
/// </summary> | ||
Bool, | ||
/// <summary> | ||
/// 32-bit integer type. | ||
/// </summary> | ||
Int32, | ||
/// <summary> | ||
/// Float type. | ||
/// </summary> | ||
Single, | ||
/// <summary> | ||
/// String type. | ||
/// </summary> | ||
String, | ||
/// <summary> | ||
/// Any texture type. | ||
/// </summary> | ||
Texture, | ||
Texture1D, | ||
Texture2D, | ||
Texture3D, | ||
/// <summary> | ||
/// 1D-texture type. | ||
/// </summary> | ||
Texture1D, | ||
/// <summary> | ||
/// 2D-texture type. | ||
/// </summary> | ||
Texture2D, | ||
/// <summary> | ||
/// 3D-texture type. | ||
/// </summary> | ||
Texture3D, | ||
/// <summary> | ||
/// Cubic texture type. | ||
/// </summary> | ||
TextureCube | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,29 @@ | ||
#region License | ||
/* | ||
Microsoft Public License (Ms-PL) | ||
XnaTouch - Copyright © 2009 The XnaTouch Team | ||
All rights reserved. | ||
This license governs use of the accompanying software. If you use the software, you accept this license. If you do not | ||
accept the license, do not use the software. | ||
1. Definitions | ||
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under | ||
U.S. copyright law. | ||
A "contribution" is the original software, or any additions or changes to the software. | ||
A "contributor" is any person that distributes its contribution under this license. | ||
"Licensed patents" are a contributor's patent claims that read directly on its contribution. | ||
2. Grant of Rights | ||
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, | ||
each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create. | ||
(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, | ||
each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software. | ||
3. Conditions and Limitations | ||
(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks. | ||
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, | ||
your patent license from such contributor to the software ends automatically. | ||
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution | ||
notices that are present in the software. | ||
(D) If you distribute any portion of the software in source code form, you may do so only under this license by including | ||
a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object | ||
code form, you may only do so under a license that complies with this license. | ||
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees | ||
or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent | ||
permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular | ||
purpose and non-infringement. | ||
*/ | ||
#endregion License | ||
|
||
using System; | ||
// MonoGame - Copyright (C) The MonoGame Team | ||
// This file is subject to the terms and conditions defined in | ||
// file 'LICENSE.txt', which is part of this source code package. | ||
|
||
namespace Microsoft.Xna.Framework.Graphics | ||
{ | ||
// change to conform to XNA 4.0 | ||
/// <summary> | ||
/// Defines formats for depth-stencil buffer. | ||
/// </summary> | ||
public enum DepthFormat | ||
{ | ||
None = -1, | ||
Depth16 = 54, | ||
Depth24 = 51, | ||
Depth24Stencil8 = 48, | ||
/// <summary> | ||
/// Depth-stencil buffer will not be created. | ||
/// </summary> | ||
None, | ||
/// <summary> | ||
/// 16-bit depth buffer. | ||
/// </summary> | ||
Depth16, | ||
/// <summary> | ||
/// 24-bit depth buffer. Equivalent of <see cref="DepthFormat.Depth24Stencil8"/> for DirectX platforms. | ||
/// </summary> | ||
Depth24, | ||
/// <summary> | ||
/// 32-bit depth-stencil buffer. Where 24-bit depth and 8-bit for stencil used. | ||
/// </summary> | ||
Depth24Stencil8 | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89b774c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TeamCity MonoGame :: Develop (Win) Build 3.3.0.2206 is now running
89b774c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TeamCity MonoGame :: Develop (Win) Build 3.3.0.2206 outcome was SUCCESS
Summary: Tests passed: 444, ignored: 6 Build time: 00:14:25