[Mesa-dev] [PATCH 12/12] spirv: Generate SPIR-V builder infrastructure

[Ian Romanick]

On 11/21/2017 03:56 AM, Eric Engestrom wrote:
>> diff --git a/src/compiler/Makefile.spirv.am b/src/compiler/Makefile.spirv.am
>> index 4bc684a..dc3c01c 100644
>> --- a/src/compiler/Makefile.spirv.am
>> +++ b/src/compiler/Makefile.spirv.am
>> @@ -20,13 +20,17 @@
>>  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
>>  # IN THE SOFTWARE.
>>  
>> +spirv/spirv_builder_functions.h: spirv/spirv_builder_h.py spirv/spirv.core.grammar.json
>> +	$(MKDIR_GEN)
>> +	$(PYTHON_GEN) $(srcdir)/spirv/spirv_builder_h.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
>> +
>>  spirv/spirv_capabilities.cpp: spirv/spirv_capabilities_h.py spirv/spirv.core.grammar.json
>>  	$(MKDIR_GEN)
>> -	$(PYTHON_GEN) $(srcdir)/spirv/spirv_capabilities_h.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
>> +	$(PYTHON_GEN) $(srcdir)/spirv/spirv_capabilities_h.py --gen-cpp $@ $(srcdir)/spirv/spirv.core.grammar.json || ($(RM) $@; false)
>>  
>>  spirv/spirv_capabilities.h: spirv/spirv_capabilities_h.py spirv/spirv.core.grammar.json
>>  	$(MKDIR_GEN)
>> -	$(PYTHON_GEN) $(srcdir)/spirv/spirv_capabilities_h.py $(srcdir)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false)
>> +	$(PYTHON_GEN) $(srcdir)/spirv/spirv_capabilities_h.py --gen-h $@ $(srcdir)/spirv/spirv.core.grammar.json || ($(RM) $@; false)
> 
> Oh, I see you fixed it already, the hunk just ended up in the wrong
> commit (:

Mystery solved!  I'll move this change to the previous commit... where
it belongs.  Thanks for catching this!