ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc tidying

This commit is contained in:
zeromus 2014-04-16 16:31:53 +00:00
parent 1f9cf53a76
commit 75905e05a6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Bizware/BizHawk.Bizware.BizwareGL.OpenTK/IGL_TK.cs
View File

@ -287,6 +287,12 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
public void BindPipeline(Pipeline pipeline)
{
if (pipeline == null)
{
sStatePendingVertexLayout = null;
GL.UseProgram(0);
return;
}
if (!pipeline.Available) throw new InvalidOperationException("Attempt to bind unavailable pipeline");
sStatePendingVertexLayout = pipeline.VertexLayout;
GL.UseProgram(pipeline.Id.ToInt32());
@ -396,7 +402,7 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
IntPtr texid = (this as IGL).GenTexture();
Texture2d tex = new Texture2d(this, texid, w, h);
GL.BindTexture(TextureTarget.Texture2D,texid.ToInt32());
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, w,h, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, w, h, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
tex.SetMagFilter(TextureMagFilter.Nearest);
tex.SetMinFilter(TextureMinFilter.Nearest);
@ -604,6 +610,8 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.OpenTK
var currBindings = sVertexAttribEnables;
sStateCurrentVertexLayout = sStatePendingVertexLayout;
if (layout == null) return;
foreach (var kvp in layout.Items)
{
GL.VertexAttribPointer(kvp.Key, kvp.Value.Components, (VertexAttribPointerType)kvp.Value.AttribType, kvp.Value.Normalized, kvp.Value.Stride, new IntPtr(pData) + kvp.Value.Offset);