From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 11 Mar 2014 20:18:44 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~35
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dc03e3b0a5b0bbe8c6cdf5da9bc72376f79857b4;hp=-c;p=movit

Merge branch 'master' into epoxy
---

dc03e3b0a5b0bbe8c6cdf5da9bc72376f79857b4
diff --combined flat_input.cpp
index 6036cf7,46370d6..55c65cc
--- a/flat_input.cpp
+++ b/flat_input.cpp
@@@ -1,6 -1,6 +1,6 @@@
  #include <string.h>
  #include <assert.h>
 -#include <GL/glew.h>
 +#include <epoxy/gl.h>
  
  #include "effect_util.h"
  #include "flat_input.h"
@@@ -24,7 -24,7 +24,7 @@@ FlatInput::FlatInput(ImageFormat image_
  	  pitch(width),
  	  pixel_data(NULL)
  {
- 	assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_BYTE);
+ 	assert(type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_SHORT || type == GL_UNSIGNED_BYTE);
  	register_int("output_linear_gamma", &output_linear_gamma);
  	register_int("needs_mipmaps", &needs_mipmaps);
  }
@@@ -46,17 -46,29 +46,29 @@@ void FlatInput::set_gl_state(GLuint gls
  		GLint internal_format;
  		GLenum format;
  		if (type == GL_FLOAT) {
- 			if (pixel_format == FORMAT_RG) {
+ 			if (pixel_format == FORMAT_R) {
+ 				internal_format = GL_R32F;
+ 			} else if (pixel_format == FORMAT_RG) {
  				internal_format = GL_RG32F;
  			} else {
  				internal_format = GL_RGBA32F;
  			}
  		} else if (type == GL_HALF_FLOAT) {
- 			if (pixel_format == FORMAT_RG) {
+ 			if (pixel_format == FORMAT_R) {
+ 				internal_format = GL_R16F;
+ 			} else if (pixel_format == FORMAT_RG) {
  				internal_format = GL_RG16F;
  			} else {
  				internal_format = GL_RGBA16F;
  			}
+ 		} else if (type == GL_UNSIGNED_SHORT) {
+ 			if (pixel_format == FORMAT_R) {
+ 				internal_format = GL_R16;
+ 			} else if (pixel_format == FORMAT_RG) {
+ 				internal_format = GL_RG16;
+ 			} else {
+ 				internal_format = GL_RGBA16;
+ 			}
  		} else if (output_linear_gamma) {
  			assert(type == GL_UNSIGNED_BYTE);
  			internal_format = GL_SRGB8_ALPHA8;
diff --combined flat_input.h
index 5f3faed,965e34d..8ac98ba
--- a/flat_input.h
+++ b/flat_input.h
@@@ -1,7 -1,7 +1,7 @@@
  #ifndef _MOVIT_FLAT_INPUT_H
  #define _MOVIT_FLAT_INPUT_H 1
  
 -#include <GL/glew.h>
 +#include <epoxy/gl.h>
  #include <assert.h>
  #include <string>
  
@@@ -78,7 -78,15 +78,15 @@@ public
  		invalidate_pixel_data();
  	}
  
- 	void set_pixel_data(const fp16_int_t *pixel_data, GLuint pbo = 0)
+ 	void set_pixel_data(const unsigned short *pixel_data, GLuint pbo = 0)
+ 	{
+ 		assert(this->type == GL_UNSIGNED_SHORT);
+ 		this->pixel_data = pixel_data;
+ 		this->pbo = pbo;
+ 		invalidate_pixel_data();
+ 	}
+ 
+ 	void set_pixel_data_fp16(const fp16_int_t *pixel_data, GLuint pbo = 0)
  	{
  		assert(this->type == GL_HALF_FLOAT);
  		this->pixel_data = pixel_data;